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

Commit f67e65be authored by 胡佳晨's avatar 胡佳晨

修改 修改快递费接口

parent 6cfeaa27
...@@ -231,10 +231,10 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -231,10 +231,10 @@ 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().add(voucherExpress)); orderVo.setPriceTotal(orderVo.getPriceModify().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().add(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);
log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_17.getValue()); log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_17.getValue());
...@@ -523,7 +523,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService { ...@@ -523,7 +523,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
} }
GoblinOrderOperationLog log = initLog(orderId, uid, now); GoblinOrderOperationLog log = initLog(orderId, uid, now);
log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_13.getValue()); log.setType(GoblinStatusConst.Status.ORDER_LOG_STATUS_13.getValue());
log.setRemark("发货:orderId=[" + orderId + "],orderSkuId=[" + StringUtils.join(skuIds,",") + "],mailNo=[" + mailNo + "]"); log.setRemark("发货:orderId=[" + orderId + "],orderSkuId=[" + StringUtils.join(skuIds, ",") + "],mailNo=[" + mailNo + "]");
//redis //redis
redisUtils.setGoblinOrder(orderId, orderVo); redisUtils.setGoblinOrder(orderId, orderVo);
......
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