diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOrderShopingStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumOrderShopingStatus.java index 463806a79..71b1ce46c 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOrderShopingStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOrderShopingStatus.java @@ -9,11 +9,13 @@ public enum EnumOrderShopingStatus { ONLINE_PURCHASE(0,"线上购买"),//不需要发货 + READY_SELF_MENTION(10,"自提商品准备中"), WAIT_SELF_MENTION(14,"已备货,待自提"), ALREADY_SELF_MENTION(15,"已自提"), - WAIT_DISTRIBUTION(24,"已发货,待签收"), - ALREADY_DISTRIBUTION(25,"已签收") + READY_DISTRIBUTION(20,"配送商品准备中"), + WAIT_DISTRIBUTION(24,"已发货,待收货"), + ALREADY_DISTRIBUTION(25,"已收货") ; public static EnumOrderShopingStatus getEnum(Integer code) { 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 9bc160544..3821cd378 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1065,6 +1065,15 @@ public class WxOrderServiceImpl implements WxOrderService { } couponOrder.setComposeOrderType(order.getComposeOrderType()); couponOrder.setComposeOrderId(order.getComposeOrderId()); + + couponOrder.setFreightPrice(order.getFreightPrice()); + couponOrder.setShippingType(order.getShippingType()); + couponOrder.setShippingAddress(order.getShippingAddress()); + if(couponOrder.getShippingType() != null && EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.READY_SELF_MENTION.getCode()); + }else if(couponOrder.getShippingType() != null && EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.READY_DISTRIBUTION.getCode()); + } //有支付信息,从支付信息中取渠道 if (null != payOrder) { couponOrder.setPayVendor(payOrder.getPayVendor()); @@ -1197,6 +1206,15 @@ public class WxOrderServiceImpl implements WxOrderService { couponOrder.setCouponPrice(order.getPayment()); couponOrder.setComposeOrderType(order.getComposeOrderType()); couponOrder.setComposeOrderId(order.getComposeOrderId()); + + couponOrder.setFreightPrice(order.getFreightPrice()); + couponOrder.setShippingType(order.getShippingType()); + couponOrder.setShippingAddress(order.getShippingAddress()); + if(couponOrder.getShippingType() != null && EnumOrderShopingType.SELF_MENTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.READY_SELF_MENTION.getCode()); + }else if(couponOrder.getShippingType() != null && EnumOrderShopingType.DISTRIBUTION.getCode().equals(couponOrder.getShippingType())){ + couponOrder.setShippingStatus(EnumOrderShopingStatus.READY_DISTRIBUTION.getCode()); + } wxCouponOrderMapper.insert(couponOrder); /// 储值卡信息添加