记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
e5e0883b
Commit
e5e0883b
authored
Feb 28, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
不修改 优惠金额
parent
82d9796d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
GoblinStoreOrderServiceImpl.java
...blin/service/impl/manage/GoblinStoreOrderServiceImpl.java
+4
-4
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java
View file @
e5e0883b
...
@@ -231,9 +231,9 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
...
@@ -231,9 +231,9 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
return
ResponseDto
.
failure
(
"已发货"
);
return
ResponseDto
.
failure
(
"已发货"
);
}
}
BigDecimal
voucherExpress
=
orderVo
.
getPriceExpress
().
subtract
(
price
);
BigDecimal
voucherExpress
=
orderVo
.
getPriceExpress
().
subtract
(
price
);
orderVo
.
setPriceTotal
(
orderVo
.
getPrice
Modify
().
subtract
(
voucherExpress
));
orderVo
.
setPriceTotal
(
orderVo
.
getPrice
Total
().
subtract
(
voucherExpress
));
orderVo
.
setPriceModify
(
orderVo
.
getPriceModify
().
add
(
voucherExpress
));
orderVo
.
setPriceModify
(
orderVo
.
getPriceModify
().
add
(
voucherExpress
));
orderVo
.
setPriceVoucher
(
orderVo
.
getPriceVoucher
().
add
(
voucherExpress
));
//
orderVo.setPriceVoucher(orderVo.getPriceVoucher().add(voucherExpress));
orderVo
.
setPriceActual
(
orderVo
.
getPriceActual
().
subtract
(
voucherExpress
));
orderVo
.
setPriceActual
(
orderVo
.
getPriceActual
().
subtract
(
voucherExpress
));
orderVo
.
setPriceExpress
(
price
);
orderVo
.
setPriceExpress
(
price
);
GoblinOrderOperationLog
log
=
initLog
(
orderId
,
uid
,
now
);
GoblinOrderOperationLog
log
=
initLog
(
orderId
,
uid
,
now
);
...
@@ -323,12 +323,12 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
...
@@ -323,12 +323,12 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
return
ResponseDto
.
failure
(
"不存在"
);
return
ResponseDto
.
failure
(
"不存在"
);
}
}
BigDecimal
voucherPrice
=
orderSkuVo
.
getSkuPriceActual
().
subtract
(
price
);
BigDecimal
voucherPrice
=
orderSkuVo
.
getSkuPriceActual
().
subtract
(
price
);
orderSkuVo
.
setPriceModify
(
price
);
orderSkuVo
.
setPriceModify
(
orderSkuVo
.
getPriceModify
().
add
(
price
)
);
orderSkuVo
.
setPriceVoucher
(
orderSkuVo
.
getPriceVoucher
().
add
(
voucherPrice
));
orderSkuVo
.
setPriceVoucher
(
orderSkuVo
.
getPriceVoucher
().
add
(
voucherPrice
));
orderSkuVo
.
setSkuPriceActual
(
orderSkuVo
.
getSkuPriceActual
().
subtract
(
voucherPrice
));
orderSkuVo
.
setSkuPriceActual
(
orderSkuVo
.
getSkuPriceActual
().
subtract
(
voucherPrice
));
orderVo
.
setPriceTotal
(
orderVo
.
getPriceTotal
().
subtract
(
voucherPrice
));
orderVo
.
setPriceTotal
(
orderVo
.
getPriceTotal
().
subtract
(
voucherPrice
));
orderVo
.
setPriceModify
(
orderVo
.
getPriceModify
().
add
(
voucherPrice
));
orderVo
.
setPriceModify
(
orderVo
.
getPriceModify
().
add
(
voucherPrice
));
orderVo
.
setPriceVoucher
(
orderVo
.
getPriceVoucher
().
add
(
voucherPrice
));
//
orderVo.setPriceVoucher(orderVo.getPriceVoucher().add(voucherPrice));
orderVo
.
setPriceActual
(
orderVo
.
getPriceActual
().
subtract
(
voucherPrice
));
orderVo
.
setPriceActual
(
orderVo
.
getPriceActual
().
subtract
(
voucherPrice
));
GoblinOrderOperationLog
log
=
initLog
(
orderId
,
uid
,
now
);
GoblinOrderOperationLog
log
=
initLog
(
orderId
,
uid
,
now
);
log
.
setType
(
GoblinStatusConst
.
Status
.
ORDER_LOG_STATUS_12
.
getValue
());
log
.
setType
(
GoblinStatusConst
.
Status
.
ORDER_LOG_STATUS_12
.
getValue
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment