Toggle navigation
Toggle navigation
This project
Loading...
Sign in
zyn
/
cjs-site
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
ye
2020-03-03 16:27:55 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
62afabfcea06b503a944625e3079c3d12ee9f600
62afabfc
1 parent
2157b7d8
提货金钱判断
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
src/main/java/com/cjs/site/action/user/pick/PickAction.java
src/main/java/com/cjs/site/biz/user/pick/PickPayBiz.java
src/main/java/com/cjs/site/action/user/pick/PickAction.java
View file @
62afabf
...
...
@@ -202,6 +202,10 @@ public class PickAction {
if
(
"80022109"
.
equals
(
ActionUtil
.
getUser
().
getUserId
())){
totalAmount
=
BigDecimal
.
ZERO
;
}
//周弟兰 80020810 账户客户要求提货,再提货操作时发现该账户提货时需要支付4万余元的仓储费,经跟客户友好协商,双方本着解决问题的态度,初步达成意向,客户同意支付2000元仓储费
if
(
"80020810"
.
equals
(
ActionUtil
.
getUser
().
getUserId
())){
totalAmount
=
new
BigDecimal
(
2000
);
}
UserInfo
userInfo
=
(
UserInfo
)
session
.
getAttribute
(
"USER_INFO"
);
if
(
"01"
.
equals
(
pickType
)){
//本人自提
model
.
addAttribute
(
"pickName"
,
userInfo
.
getClient_id
());
...
...
src/main/java/com/cjs/site/biz/user/pick/PickPayBiz.java
View file @
62afabf
...
...
@@ -68,6 +68,10 @@ public class PickPayBiz {
if
(
"80022109"
.
equals
(
ActionUtil
.
getUser
().
getUserId
())){
totalAmount
=
new
BigDecimal
(
"6"
);
}
//周弟兰 80020810 账户客户要求提货,再提货操作时发现该账户提货时需要支付4万余元的仓储费,经跟客户友好协商,双方本着解决问题的态度,初步达成意向,客户同意支付2000元仓储费
if
(
"80020810"
.
equals
(
ActionUtil
.
getUser
().
getUserId
())){
totalAmount
=
new
BigDecimal
(
"2006"
);
}
result
.
put
(
"totalAmount"
,
totalAmount
);
try
{
CreateQrCode
createQrCode
=
new
CreateQrCode
();
...
...
Please
register
or
login
to post a comment