fix: 再次分配功能开发

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -719,13 +719,17 @@ public class IoOrderController extends BaseController {
         orderService.copyOrder(authAdmin,newBillNo,newIoOrderEntity,oldIoOrderEntity);
         orderService.insertOrder(newIoOrderEntity);
         //处理io_order_detail_biz
-        orderDetailBizService.copyOrderDetailBiz(newBillNo,oldBillNo);
+        boolean orderDetailBizFlag = orderDetailBizService.copyOrderDetailBiz(newBillNo, oldBillNo);
         //处理io_order_detail_code
-        orderDetailCodeService.copyOrderDetailCode(newBillNo,oldBillNo);
+        boolean orderDetailCodeFlag = orderDetailCodeService.copyOrderDetailCode(newBillNo, oldBillNo);
         //处理io_code
-        codeTempService.copyCodeTemp(newBillNo,oldBillNo);
+        boolean codeTempFlag = codeTempService.copyCodeTemp(newBillNo, oldBillNo);
 
-        return ResultVOUtils.success(newBillNo);
+        if (orderDetailBizFlag && orderDetailCodeFlag && codeTempFlag){
+            return ResultVOUtils.success(newIoOrderEntity);
+        }
+
+        return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
     }
 
     @Resource

src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
@@ -13,6 +14,7 @@ import com.glxp.api.req.inout.FilterCodeRequest;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.util.BeanCopyUtils;
+import com.glxp.api.util.DateUtil;
 import com.glxp.api.util.page.PageQuery;
 import com.glxp.api.util.page.TableDataInfo;
 import org.springframework.beans.BeanUtils;
@@ -21,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -130,12 +133,15 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
                 IoCodeTempEntity ioCodeTempEntity = new IoCodeTempEntity();
                 BeanUtils.copyProperties(x,ioCodeTempEntity);
                 ioCodeTempEntity.setOrderId(newBillNo);
+                ioCodeTempEntity.setId(null);
+                ioCodeTempEntity.setUpdateTime(new Date());
+                ioCodeTempEntity.setCreateTime(new Date());
                 newIoCodeTempEntityList.add(ioCodeTempEntity);
             });
             //批量插入
-            ioCodeTempDao.insertBatch(newIoCodeTempEntityList);
+            return ioCodeTempDao.insertBatch(newIoCodeTempEntityList);
         }
-        return false;
+        return true;
     }
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -222,12 +223,12 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             //遍历修改新单号为新订单号
             oldOrderDetailBiz.forEach( x -> {
                 x.setOrderIdFk(newBillNo);
+                x.setId(IdUtil.getSnowflakeNextId());
                 newOrderDetailBiz.add(x);
             });
-            //批量插入
+            return ioOrderDetailBizDao.insertBatch(newOrderDetailBiz);
-            ioOrderDetailBizDao.insertBatch(newOrderDetailBiz);
         }
-        return false;
+        return true;
     }
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -147,12 +148,14 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
             //遍历修改新单号为新订单号
             oldOrderDetailCode.forEach( x -> {
                 x.setOrderIdFk(newBillNo);
+                x.setId(IdUtil.getSnowflakeNextId());
+                x.setUpdateTime(new Date());
                 newOrderDetailCode.add(x);
             });
             //批量插入
-            ioOrderDetailCodeDao.insertBatch(newOrderDetailCode);
+            return ioOrderDetailCodeDao.insertIgnoreBatchs(newOrderDetailCode);
         }
-        return false;
+        return true;
     }
 
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -901,6 +901,7 @@ public class IoOrderServiceImpl implements IoOrderService {
         newIoOrderEntity.setFromType(ConstantStatus.FROM_WEBNEW);//网页新增
         newIoOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);//草稿
         newIoOrderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//草稿
+        newIoOrderEntity.setCorpOrderId(oldIoOrderEntity.getCorpOrderId()+"X");//单据号
         newIoOrderEntity.setCreateUser(authAdmin.getId() + "");
         newIoOrderEntity.setCreateTime(new Date());
         newIoOrderEntity.setUpdateUser(authAdmin.getId() + "");