diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
index 10c07e5af..dd64d8074 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
@@ -78,7 +78,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
throw new MallinkException(ErrorCode.DB_FAIL);
}
//更新order
- order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode());
+ order.setOrderStatus(wxOrderGroup.getStatus());
order.setPressEndDate(wxOrderGroup.getExpiredDate());
order.setOrderGroupId(wxOrderGroup.getId());
try {
diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml
index c1a445cfe..a9c8d88d6 100644
--- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml
@@ -83,7 +83,10 @@
and o.id=#{id}
- and o.order_group_id!=0 and o.order_status in(10,11,12,13)
+
+ and o.order_group_id=#{orderGroupId}
+
+ and o.order_group_id!=0 and g.status in(10,11,12,13)
order by o.id desc,o.order_status