diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 9ea544df0..43b3b05ac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2169,7 +2169,7 @@ public class WxOrderServiceImpl implements WxOrderService { record.setOrderGroupId(orderdto.getSignleOrder().getOrderGroupId()); record.setFormId(orderdto.getSignleOrder().getFormId()); - record.setPayment(price.getRealPayMent()+coupon.getFreightPrice());//加运费 + record.setPayment(price.getRealPayMent()); record.setFreightPrice(coupon.getFreightPrice()); record.setShippingType(orderdto.getShippingType()); 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 243df9164..255e6a027 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 @@ -17,6 +17,7 @@ import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumComposeOrder; +import com.iformall.enums.EnumOrderShopingType; import com.iformall.enums.EnumPayWay; import com.iformall.mapper.WxBatchOrderMapper; import com.iformall.mapper.WxOrderMapper; @@ -55,6 +56,10 @@ public abstract class BaseBatchOrderAdapterService implements OrderAdapterServic boolean isPress = ocsd.getSignleOrder().isPressOrder(); WxComposeChildOrderPrice price = getChildCouponOrderPrice(ocsd.getWxCoupon(), isPress, ocsd.getSignleOrder().getOrderGroupId(), ocsd.getCount()); payment = payment+price.getRealPayMent(); + //在线配送加上运费 + if (EnumOrderShopingType.DISTRIBUTION.getCode().equals(ocsd.getShippingType())) { + payment = payment + ocsd.getWxCoupon().getFreightPrice(); + } } order.setPayment(payment); order.setCreateDate(new Date());