修改重新下单

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -134,12 +134,13 @@ public class OrderController extends BaseController {
 
 
     @Autowired
     @Autowired
     public OrderController(OrderMapper orderMapper, SchoolMapper schoolMapper, SysUserMapper sysUserMapper,
     public OrderController(OrderMapper orderMapper, SchoolMapper schoolMapper, SysUserMapper sysUserMapper,
-                           AppMapper appMapper, ExportExcelMapper exportExcelMapper) {
+                           AppMapper appMapper, ExportExcelMapper exportExcelMapper, OrderViewMapper orderViewMapper) {
         OrderController.orderMapper = orderMapper;
         OrderController.orderMapper = orderMapper;
         OrderController.schoolMapper = schoolMapper;
         OrderController.schoolMapper = schoolMapper;
         OrderController.sysUserMapper = sysUserMapper;
         OrderController.sysUserMapper = sysUserMapper;
         OrderController.appMapper = appMapper;
         OrderController.appMapper = appMapper;
         this.exportExcelMapper = exportExcelMapper;
         this.exportExcelMapper = exportExcelMapper;
+        OrderController.orderViewMapper = orderViewMapper;
     }
     }
 
 
     /**
     /**
@@ -605,6 +606,25 @@ public class OrderController extends BaseController {
             sf.append(",订单状态由"+order.get("order_status")+"修改为"+order_status);
             sf.append(",订单状态由"+order.get("order_status")+"修改为"+order_status);
         }
         }
         try {
         try {
+            if ("重新下单".equals(order_status)) {
+                dataMapping.put("order_status","未下单");
+                // 重新生成码
+                Wrapper<OrderView> orderViewWrapper = new EntityWrapper<>();
+                orderViewWrapper.eq("orderSeq", hhrOrderId.get(0).get("kd_order_id"));
+                List<OrderView> orderViews = orderViewMapper.selectList(orderViewWrapper);
+                if (orderViews == null || orderViews.size() != 1) {
+                    return ResponseData.success("编辑失败，无法重新下单！");
+                }
+
+                String orderSeq = RandomUtil.RandomNumber(20);
+
+                dataMapping.put("kd_order_id", orderSeq);
+
+                OrderView orderView = new OrderView();
+                orderView.setOrderId(orderViews.get(0).getOrderId());
+                orderView.setOrderSeq(orderSeq);
+                orderViewMapper.updateById(orderView);
+            }
             Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
             Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
             if(integer == 1){
             if(integer == 1){
                 orderMapper.inserOrderHis(id,"用户资料修改:"+sf.toString(),new Date(),user.getName());
                 orderMapper.inserOrderHis(id,"用户资料修改:"+sf.toString(),new Date(),user.getName());