submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1121,22 +1121,25 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
         List<TopOldOrderGoods> list = topOrderGoodsService.listByIds(bo.getOrderGoodsIds());
         list.forEach(x -> x.setCheckStatus(bo.getCheckStatus()));
+        List<String> signIds = Arrays.stream(oldOrder.getCheckRemark().split(",")).filter(x -> !bo.getOrderGoodsIds().contains(x)).collect(Collectors.toList());
+        List<TopOldOrderGoods> topOldOrderGoods = topOrderGoodsService.
+                list(new LambdaQueryWrapper<TopOldOrderGoods>()
+                .eq(TopOldOrderGoods::getCheckStatus, -1)
+                .eq(TopOldOrderGoods::getOrderSn, bo.getOrderSn())
+                .in(TopOldOrderGoods::getSignId, signIds));
         if (StringUtils.isNotBlank(oldOrder.getCheckRemark()) && bo.getCheckStatus() == 2){
-            List<Long> collect = list.stream().map(TopOldOrderGoods::getSignId).collect(Collectors.toList());
-            List<String> collect1 = Arrays.stream(oldOrder.getCheckRemark().split(",")).filter(x -> !collect.contains(x)).collect(Collectors.toList());
                 //不通过 恢复数据
-                topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
-                        .set(TopOldOrderGoods::getCheckStatus,1)
-                        .eq(TopOldOrderGoods::getOrderSn,bo.getOrderSn())
-                        .in(TopOldOrderGoods::getSignId,collect1));
+                topOldOrderGoods.forEach(x -> x.setCheckStatus(1));
+                topOrderGoodsService.updateBatchById(topOldOrderGoods);
         }
         topOrderGoodsService.updateBatchById(list);
+
         if (oldOrder.getOrderBase() == 1) {
             //处理退学学员 并且订单在新系统
             switch (bo.getCheckStatus()) {
                 case 1://审核通过
                     List<String> userNames = new ArrayList<>();
-                    list.forEach(item -> {
+                    topOldOrderGoods.forEach(item -> {
                         User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
                         userNames.add(user.getNickname());
                         if (ObjectUtil.isNull(user)) {
@@ -1166,7 +1169,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     this.informRemind(userNames);
                     break;
                 case 2: //审核未通过
-                    list.forEach(item -> {
+                    topOldOrderGoods.forEach(item -> {
                         User user = userService.getOne(new LambdaQueryWrapper<User>().eq(User::getIdCard, item.getUserCard()));
                         if (ObjectUtil.isNull(user)) {
                             return;