submit

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

@@ -57,7 +57,11 @@ import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareGoodsVo;
 import com.zhongzheng.modules.order.vo.OrderShareToOldVo;
 import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheck;
+import com.zhongzheng.modules.top.goods.domain.TopOldOrderCheckLog;
 import com.zhongzheng.modules.top.goods.domain.TopOldOrderRefund;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckLogService;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderCheckService;
 import com.zhongzheng.modules.top.goods.service.ITopOldOrderRefundService;
 import com.zhongzheng.modules.user.bo.UserExamGoodsQueryBo;
 import com.zhongzheng.modules.user.bo.UserExamRecordQueryBo;
@@ -129,6 +133,10 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
     private IDistributionRebateService iDistributionRebateService;
     @Autowired
     private ITopOldOrderRefundService topOldOrderRefundService;
+    @Autowired
+    private ITopOldOrderCheckService topOldOrderCheckService;
+    @Autowired
+    private ITopOldOrderCheckLogService topOldOrderCheckLogService;
     @Value("${oldStudySys.shareCanclePath}")
     private String SHARE_CANCLE_PATH;
 
@@ -275,19 +283,50 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         //退款单号
-        add.setRefundSn(DateUtils.getDateOrderSn());
+        String refundSn = DateUtils.getDateOrderSn();
+        add.setRefundSn(refundSn);
         add.setRefundFee(orderGoods.getGoodsReceived());
         add.setUserId(order.getUserId());
         add.setType(3);//新云学堂C端退款
         add.setPeriodStatus(0);//待审核
         add.setOrderGoodsId(orderGoods.getOrderGoodsId());
         topOldOrderRefundService.save(add);
-
-
+        //订单状态修改
+        iOrderService.update(new LambdaUpdateWrapper<Order>()
+                        .set(Order::getRefundStatus,0)//待审核
+                        .eq(Order::getOrderSn,orderGoods.getOrderSn()));
         //修改订单状态
         iOrderGoodsService.update(new LambdaUpdateWrapper<OrderGoods>()
         .set(OrderGoods::getRefundStatus,1)
         .eq(OrderGoods::getOrderGoodsId,orderGoods.getOrderGoodsId()));
+        //创建退款审核流程
+        //创建订单退款审核流程
+        List<TopOldOrderCheck> checkList = topOldOrderCheckService
+                .list(new LambdaQueryWrapper<TopOldOrderCheck>().in(TopOldOrderCheck::getCheckType, Arrays.asList(2, 3))
+                        .orderByAsc(TopOldOrderCheck::getCheckSort));
+        if (CollectionUtils.isNotEmpty(checkList)) {
+            List<TopOldOrderCheckLog> logs = new ArrayList<>();
+            for (int i = 0; i < checkList.size(); i++) {
+                TopOldOrderCheck check = checkList.get(i);
+                TopOldOrderCheckLog log = new TopOldOrderCheckLog();
+                log.setRefundSn(refundSn);
+                log.setRoleId(check.getCheckRole());
+                log.setCheckFrom(1);//退款
+                log.setUpdateTime(DateUtils.getNowTime());
+                log.setCreateTime(DateUtils.getNowTime());
+                log.setTenantId(goods.getTenantId());
+                log.setCheckSign(i > 0 ? 0 : 1);
+                log.setCheckSort(check.getCheckSort());
+                log.setType(check.getCheckType());
+                if (check.getCheckType() == 3) {
+                    log.setCheckStatus(2);//待支付
+                } else {
+                    log.setCheckStatus(0);//待审核
+                }
+                logs.add(log);
+            }
+            topOldOrderCheckLogService.saveBatch(logs);
+        }
 
         //通知教务审核（后台站内信）
         InformRemind informRemind = informRemindService.getOne(new LambdaQueryWrapper<InformRemind>()

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

@@ -1423,7 +1423,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 TopOldOrderCheckLog log = new TopOldOrderCheckLog();
                 log.setRefundSn(refundSn);
                 log.setRoleId(check.getCheckRole());
-
+                log.setCheckFrom(1);//退款
                 log.setUpdateTime(DateUtils.getNowTime());
                 log.setCreateTime(DateUtils.getNowTime());
                 log.setTenantId(tenantId);