记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit e5e0883b authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

不修改 优惠金额

parent 82d9796d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
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.getPriceModify().subtract(voucherExpress)); orderVo.setPriceTotal(orderVo.getPriceTotal().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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment