|
|
|
@@ -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); |
|
|
|
|
|
|
|
/// 储值卡信息添加 |
|
|
|
|