submit

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

@@ -1031,17 +1031,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         if (roleIdList.stream().noneMatch(x -> x.equals(checkLog.getRoleId())) && !"admin".equals(bo.getLoginName())) {
             throw new CustomException("当前账号没有审核权限");
         }
-        oldOrder.setCheckStatus(bo.getCheckStatus());
         oldOrder.setCheckBy(bo.getLoginName());
         oldOrder.setCheckTime(DateUtils.getNowTime());
-        LambdaQueryWrapper<TopOldOrderGoods> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(TopOldOrderGoods::getOrderSn, oldOrder.getOrderSn());
-        wrapper.eq(TopOldOrderGoods::getStatus, 1);
-        List<TopOldOrderGoods> orderGoods = topOrderGoodsService.list(wrapper);
-        if (CollectionUtils.isNotEmpty(orderGoods)) {
-            orderGoods.forEach(x -> x.setCheckStatus(bo.getCheckStatus()));
-            topOrderGoodsService.updateBatchById(orderGoods);
-        }
+
         Boolean brokerageFlag = false;
         switch (bo.getCheckStatus()){
             case 1://通过审核 如果佣金有修改重新计算成本
@@ -1050,9 +1042,8 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         && ObjectUtils.isNotNull(oldOrder.getPretaxRecord())) {
                     recalculateCost(oldOrder.getCostJson(),oldOrder);
                     brokerageFlag = true;
-                    //佣金不通过不影响订单审核
-                    oldOrder.setCheckStatus(1);
                 }
+                oldOrder.setCheckStatus(bo.getCheckStatus());
                 break;
             case 2://拒绝 恢复原本的佣金
                 if (StringUtils.isNotBlank(oldOrder.getCostJson())
@@ -1068,11 +1059,23 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     oldOrder.setPretaxRecord(null);
                     oldOrder.setPretaxBrokerageRecord(null);
                     brokerageFlag = true;
+                }else {
+                    //修改佣金审核不影响订单审核状态
+                    oldOrder.setCheckStatus(bo.getCheckStatus());
                 }
                 break;
               default :
                   break;
         }
+        LambdaQueryWrapper<TopOldOrderGoods> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(TopOldOrderGoods::getOrderSn, oldOrder.getOrderSn());
+        wrapper.eq(TopOldOrderGoods::getStatus, 1);
+        wrapper.eq(TopOldOrderGoods::getCheckStatus,0);//待审核
+        List<TopOldOrderGoods> orderGoods = topOrderGoodsService.list(wrapper);
+        if (CollectionUtils.isNotEmpty(orderGoods)) {
+            orderGoods.forEach(x -> x.setCheckStatus(oldOrder.getCheckStatus()));
+            topOrderGoodsService.updateBatchById(orderGoods);
+        }
 
         updateById(oldOrder);
         // 订单审核通知业务系统