From 4f2da9227bcdb1082d9b5c3dd08c4f0ede41eaa7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 30 Sep 2021 11:27:25 +0800 Subject: [PATCH] update freightPrice --- .../service/order/entity/WxComposeChildOrderPrice.java | 6 ++++-- .../service/order/impl/SingleOrderAdapterService.java | 5 +++-- .../order/impl/batch/BaseBatchOrderAdapterService.java | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderPrice.java b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderPrice.java index 5137adfd9..89d13e080 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderPrice.java +++ b/mallinkService/src/main/java/com/iformall/service/order/entity/WxComposeChildOrderPrice.java @@ -5,15 +5,17 @@ import lombok.Data; @Data public class WxComposeChildOrderPrice { - public WxComposeChildOrderPrice(Integer productSinglePrice,Integer productNumber,Long productId) { + public WxComposeChildOrderPrice(Integer productSinglePrice,Integer productNumber,Integer freightPrice, Long productId) { this.productSinglePrice = productSinglePrice; this.productNumber = productNumber; + this.freightPrice = freightPrice; this.productId = productId; - this.realPayMent = productSinglePrice*productNumber; + this.realPayMent = productSinglePrice*productNumber+freightPrice; } private Integer realPayMent;//真实支付价格 private Integer productSinglePrice;//产品单价 private Integer productNumber;//产品数量 + private Integer freightPrice;//运费 private Long productId;//产品编号 } diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java index 5cc013195..0176a0c15 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java @@ -57,11 +57,12 @@ public class SingleOrderAdapterService implements OrderAdapterService { public WxComposeChildOrderPrice getChildCouponOrderPrice(OrderComposeSaveDto orderdto,WxCoupon coupon, boolean isPress, Long orderGroupId, Integer couponNumber) { Integer perPrice = OrderHelper.getCouponPerPayment(coupon, isPress, orderGroupId); + Integer freightPrice = 0; //在线配送加上运费 if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())) { - perPrice = perPrice + coupon.getFreightPrice(); + freightPrice = coupon.getFreightPrice(); } - return new WxComposeChildOrderPrice(perPrice, couponNumber, coupon.getId()); + return new WxComposeChildOrderPrice(perPrice, couponNumber,freightPrice, coupon.getId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java index 786e18d3b..4c0cbdd8f 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/BaseBatchOrderAdapterService.java @@ -42,11 +42,12 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic @Override public WxComposeChildOrderPrice getChildCouponOrderPrice(OrderComposeSaveDto orderdto,WxCoupon coupon,boolean isPress,Long orderGroupId,Integer couponNumber) { Integer perPrice = OrderHelper.getCouponPerPayment(coupon, isPress, orderGroupId); + Integer freightPrice = 0; //在线配送加上运费 if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())) { - perPrice = perPrice + coupon.getFreightPrice(); + freightPrice = coupon.getFreightPrice(); } - return new WxComposeChildOrderPrice(perPrice, couponNumber, coupon.getId()); + return new WxComposeChildOrderPrice(perPrice, couponNumber, freightPrice, coupon.getId()); } @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})