fix some bug

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -1410,7 +1410,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
                 break;
             case 4:
                 pinkCriteria.andEqualTo("status", StorePinkStatusEnum.RESULTS_ANNOUNCED.getKey());
-                pinkCriteria.andIn("orderStatus", Arrays.asList(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(), PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey(), PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey()));
+                pinkCriteria.andIn("orderStatus", Arrays.asList(PinkOrderStatusEnum.GROUP_ORDER_TO_SHIP.getKey(), PinkOrderStatusEnum.GROUP_ORDER_TO_RECEIVE.getKey(), PinkOrderStatusEnum.GROUP_ORDER_COMPLETED.getKey(), PinkOrderStatusEnum.GROUP_ORDER_RECYCLE.getKey()));
                 pinkList = storePinkService.findByCondition(pinkCondition);
                 if (CollUtil.isNotEmpty(pinkList)) {
                     criteria.andIn("orderId", pinkList.stream().map(StorePink::getOrderId).collect(Collectors.toList()));
@@ -2776,6 +2776,13 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         // 更新订单状态
         for (String orderNo : orderNos) {
             this.updateOrderStatus(orderNo, PinkOrderStatusEnum.GROUP_ORDER_RECYCLE.getKey());
+            // 更新拼团表订单状态
+            StorePink storePink = storePinkService.findBy("orderId", orderNo);
+            Long storePinkId = storePink.getId();
+            storePink = new StorePink();
+            storePink.setId(storePinkId);
+            storePink.setOrderStatus(PinkOrderStatusEnum.GROUP_ORDER_RECYCLE.getKey());
+            storePinkService.update(storePink);
         }
         // 添加回收数
         userDubboServiceClient.addNumberOfRecycle(userId, orderNos.size());