merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -446,6 +446,8 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         update.setWxpayRefundId(WxpayRefundId);
         update.setRefundTime(DateUtils.getNowTime());
         update.setPeriodStatus(3);//已完成
+        update.setDivideModel(orderGoods.getDivideModel());
+        update.setDivideMoney(orderGoods.getDivideMoney());
         this.updateById(update);
         //修改订单商品退款状态
         orderGoods.setRefundStatus(2); //已退款

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://通过审核 如果佣金有修改重新计算成本
@@ -1051,6 +1043,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     recalculateCost(oldOrder.getCostJson(),oldOrder);
                     brokerageFlag = true;
                 }
+                oldOrder.setCheckStatus(bo.getCheckStatus());
                 break;
             case 2://拒绝 恢复原本的佣金
                 if (StringUtils.isNotBlank(oldOrder.getCostJson())
@@ -1066,11 +1059,24 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     oldOrder.setPretaxRecord(null);
                     oldOrder.setPretaxBrokerageRecord(null);
                     brokerageFlag = true;
+                    //修改佣金审核不影响订单审核状态
+                    oldOrder.setCheckStatus(1);
+                }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);
         // 订单审核通知业务系统
@@ -1332,7 +1338,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
             }
             //旧系统B端网银退款处理
             Integer sign = handleEnterpriseRefund(refundPrice, order, bo,orderRefundList.get(0).getType(),orderRefundList);
-            orderRefundList.forEach(x -> x.setPeriodStatus(sign==2?4:3));//支付中
+            orderRefundList.forEach(x ->{
+                x.setPeriodStatus(sign==2?4:3);//支付中
+                //待扣分成
+                TopOldOrderGoods orderGoods = topOrderGoodsService.getById(x.getOrderGoodsId());
+                x.setDivideModel(orderGoods.getDivideModel());
+                x.setDivideMoney(orderGoods.getDivideMoney());
+            } );
             topOldOrderRefundService.updateBatchById(orderRefundList.stream().map(x -> BeanUtil.toBean(x,TopOldOrderRefund.class)).collect(Collectors.toList()));
             update(new LambdaUpdateWrapper<TopOldOrder>()
                     .set(TopOldOrder::getRefundStatus,sign==2?5:3) // 支付中
@@ -1351,7 +1363,13 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }else if (order.getOrderFrom() == 2 && bo.getPayType() == 1){
             // 旧系统C端微信退款处理
             checkInform(order.getOrderSn(),orderRefundList.get(0).getType(),"",1,1,"已支付");
-            orderRefundList.forEach(x -> x.setPeriodStatus(3));//已完成
+            orderRefundList.forEach(x -> {
+                x.setPeriodStatus(3);//已完成
+                //待扣分成
+                TopOldOrderGoods orderGoods = topOrderGoodsService.getById(x.getOrderGoodsId());
+                x.setDivideModel(orderGoods.getDivideModel());
+                x.setDivideMoney(orderGoods.getDivideMoney());
+            });
             topOldOrderRefundService.updateBatchById(orderRefundList.stream().map(x -> BeanUtil.toBean(x,TopOldOrderRefund.class)).collect(Collectors.toList()));
             topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
             .set(TopOldOrderGoods::getRefundStatus,2)//已退款
@@ -3183,7 +3201,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
            switch (bo.getStatus()){
                case 0://支付失败
                    bankPay.setResultStatus(-1);
-                   list.forEach(x -> x.setPeriodStatus(5));//支付失败
+                   list.forEach(x ->{
+                       x.setPeriodStatus(5);
+                       x.setRefundTime(DateUtils.getNowTime());
+                   });//支付失败
                    topOldOrderRefundService.updateBatchById(list);
                    topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
                    .set(TopOldOrderGoods::getRefundStatus,4)
@@ -3192,7 +3213,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                    break;
                case 1://支付成功
                    bankPay.setResultStatus(1);
-                   list.forEach(x -> x.setPeriodStatus(3));//支付成功
+                   list.forEach(x -> {
+                       x.setPeriodStatus(3);
+                       x.setRefundTime(DateUtils.getNowTime());
+                   });//支付成功
                    topOldOrderRefundService.updateBatchById(list);
                    topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
                            .set(TopOldOrderGoods::getRefundStatus,2) //支付成功