diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
index 38f191bc3..976255e97 100644
--- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
+++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
@@ -132,4 +132,10 @@ public class WxOrderCouponVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType")
private Integer shippingType;
+ @io.swagger.annotations.ApiModelProperty(value="配送状态 0:默认(无) 1*:自提 2*:配送",name="shippingStatus")
+ private Integer shippingStatus;
+
+ @io.swagger.annotations.ApiModelProperty(value="配送信息",name="deliveryInfo")
+ private String deliveryInfo;
+
}
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 b6f9fe7a8..fd4294b38 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
@@ -2170,10 +2170,9 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setFormId(orderdto.getSignleOrder().getFormId());
record.setPayment(price.getRealPayMent());
- record.setFreightPrice(coupon.getFreightPrice());
-
record.setShippingType(orderdto.getShippingType());
if(EnumOrderShopingType.DISTRIBUTION.getCode().equals(orderdto.getShippingType())){
+ record.setFreightPrice(coupon.getFreightPrice());
record.setShippingAddress(JSON.toJSONString(orderdto.getAddress()));
}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
index b914658da..58bff9d1f 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java
@@ -145,7 +145,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
oldRecord.setUpdateTime(curDate);
wxPayOrderMapper.updateById(oldRecord);
- if (EnumComposeOrder.isSingle(composeOrder.getComposeOrderType())) {
+ if (!EnumComposeOrder.isSingle(composeOrder.getComposeOrderType())) {
//如果是组合订单的单独处理。如定时处理的单个订单
if (isOneChildOrder) {
//处理其他信息
diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
index 4c4fa1f12..4ed341455 100644
--- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml
@@ -344,6 +344,8 @@
+
+
-->
- o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.`freight_price`,o.order_status,o.create_date,o.update_date,
+ o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date,
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,
- o.compose_order_type,o.compose_order_id,o.`shipping_type`,o.`shipping_address`
+ o.compose_order_type,o.compose_order_id,
+ co.`freight_price`,co.`shipping_type`,co.`shipping_address`,co.`shipping_status`,co.`delivery_info`