fix:完成新增功能

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderManagementController.java

@@ -1,5 +1,6 @@
 package org.dromara.bulk.controller;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.service.BulkOrderManagementService;
@@ -15,10 +16,11 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/bulkOrder/daHuoDingDanGuanLi")
+@RequestMapping("/bulkOrder/BulkOrderManagement")
 class BulkOrderManagementController extends BaseController {
     private final BulkOrderManagementService BulkOrderManagementService;
 
+    @SaIgnore
     @PostMapping()
     public R<Void> insertBulkOrder(@RequestBody NewBulkOrderBo newBulkOrderBo){
         return toAjax(BulkOrderManagementService.insertBulkOrder(newBulkOrderBo));

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/UserOrder.java

@@ -6,8 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
-import java.util.Date;
-
 
 /**
  * 用户订单表基类
@@ -68,10 +66,5 @@ public class UserOrder extends TenantEntity {
      * 支付状态
      * 0=支付中,1=支付成功,2=支付失败
      */
-    private int pay_Status = 0;
-
-    /**
-     * 支付时间
-     */
-    private Date payTime;
+    private int payStatus = 0;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/NewBulkOrderBo.java

@@ -2,6 +2,7 @@ package org.dromara.bulk.domain.bo;
 
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -14,7 +15,7 @@ public class NewBulkOrderBo {
     /**
      * 用户id
      */
-    private Long user_id;
+    private Long userId;
 
     /**
      * 用户名
@@ -22,9 +23,9 @@ public class NewBulkOrderBo {
     private String userName;
 
     /**
-     * 电话
+     * 用户电话
      */
-    private int phone;
+    private String userPhone;
 
     /**
      * 备注
@@ -32,12 +33,24 @@ public class NewBulkOrderBo {
     private String remark;
 
     /**
-     * 商品名称
+     * 创建时间
      */
-    private String goodsName;
+    private Date createTime;
 
     /**
      * 订单信息列表
      */
     private List<OrderListBo> orderLists;
+
+    @Override
+    public String toString() {
+        return "NewBulkOrderBo{" +
+            "userId=" + userId +
+            ", userName='" + userName + '\'' +
+            ", userPhone='" + userPhone + '\'' +
+            ", remark='" + remark + '\'' +
+            ", createTime=" + createTime +
+            ", orderLists=" + orderLists.toString() +
+            '}';
+    }
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/OrderListBo.java

@@ -1,34 +1,39 @@
 package org.dromara.bulk.domain.bo;
 
 import lombok.Data;
-import org.dromara.commodityManagement.domain.bo.CraftBo;
-import org.dromara.commodityManagement.domain.bo.DaHuoNumberBo;
-import org.dromara.commodityManagement.domain.bo.OemBo;
 import org.dromara.commodityManagement.domain.bo.TemplateBo;
 
 import java.util.Date;
 import java.util.List;
 
+/**
+ * 订单列表BO对象
+ */
 @Data
 public class OrderListBo {
 
     /**
-     * 大货编号
+     * 大货编号名称
      */
-    private DaHuoNumberBo DaHuoNumberBo;
+    private String daHuoNumberName;
 
     /**
-     * 成衣厂
+     * 大货编号id
+     */
+    private Long daHuoNumberId;
+
+    /**
+     * 工程名称
      */
     private String garmentFactory;
 
     /**
-     * 成衣厂联系人
+     * 收货人
      */
     private String garmentFactoryPeople;
 
     /**
-     * 成衣厂电话
+     * 收货人电话
      */
     private String garmentFactoryTel;
 
@@ -68,14 +73,14 @@ public class OrderListBo {
     private String brandGroup;
 
     /**
-     * 工艺类型
+     * 工艺id
      */
-    private CraftBo craft;
+    private String craftId;
 
     /**
      * 版图列表
      */
-    private List<TemplateBo> templateList;//未找到表
+    private List<TemplateBo> templateList;
 
     /**
      * 烧花,0否，1是
@@ -117,23 +122,15 @@ public class OrderListBo {
      */
     private String isSys = "0";
 
-    /**
-     * 用户id
-     */
-    private Long userId;
-
     /**
      * 花型号
      */
-    private OemBo Oem;
+    private String oemId;
 
     /**
      * 款式图
      */
     private String styleImage;
 
-    /**
-     * 创建时间
-     */
-    private Date createTime;
+
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderManagementServiceImpl.java

@@ -2,22 +2,20 @@ package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
+import org.dromara.bulk.domain.UserOrder;
 import org.dromara.bulk.domain.UserOrderTemplate;
-import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.bo.NewBulkOrderBo;
 import org.dromara.bulk.domain.bo.OrderListBo;
 import org.dromara.bulk.mapper.BulkOrderListMapper;
 import org.dromara.bulk.mapper.UserOrderMapper;
 import org.dromara.bulk.mapper.UserOrderTemplateMapper;
 import org.dromara.bulk.service.BulkOrderManagementService;
-import org.dromara.commodityManagement.domain.Template;
 import org.dromara.commodityManagement.domain.bo.TemplateBo;
-import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.OrderNumberGenerator;
-import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.productionManagement.domain.ProductionPlan;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,25 +33,37 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
     private final UserOrderTemplateMapper userOrderTemplateMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int insertBulkOrder(NewBulkOrderBo newBulkOrderBo) {
-        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
-        for (OrderListBo orderList : newBulkOrderBo.getOrderLists()){
-            String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
-            String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
-            String orderNumber = orderNumberGenerator.generateOrderNumber("DH");
+        try {
+            OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
+            for (OrderListBo orderList : newBulkOrderBo.getOrderLists()){
+                //生成各种单号
+                String sysNo = orderNumberGenerator.generateOrderNumber("SYS");
+                String purchaseCode = orderNumberGenerator.generateOrderNumber("SC");
+                String orderNumber = orderNumberGenerator.generateOrderNumber("DH");
 
-            productionPlanMapper.insert(initProductionPlanBo(orderList, sysNo, purchaseCode, orderNumber));
+                bulkOrderListMapper.insert(initBulkOrderList(orderList, sysNo, purchaseCode));
 
-            bulkOrderListMapper.insert(initBulkOrderListBo(orderList, sysNo, purchaseCode));
+                ProductionPlan productionPlan = initProductionPlan(newBulkOrderBo, orderList, sysNo, purchaseCode, orderNumber);
+                productionPlanMapper.insert(productionPlan);
 
-            Long orderId = userOrderMapper.selectLastId();
-            Long planId = productionPlanMapper.selectLastId();
+                UserOrder userOrder = initUserOrder(newBulkOrderBo, orderList, orderNumber, newBulkOrderBo.getRemark());
+                userOrderMapper.insert(userOrder);
 
-            List<UserOrderTemplate> userOrderTemplate = initUserOrderTemplate(orderList, orderId, planId);
-            userOrderTemplateMapper.insert(userOrderTemplate);
-        }
+                //获取订单id和生产计划id
+                Long orderId = productionPlan.getId();
+                Long planId = userOrder.getId();
 
-        return 0;
+                if (null != orderList.getTemplateList()){
+                    userOrderTemplateMapper.insert(initUserOrderTemplate(newBulkOrderBo, orderList, orderId, planId));
+                    System.out.println("user_order_template表新增完成");
+                }
+            }
+            return 1;
+        } catch (Exception e) {
+            return 0;
+        }
     }
 
     /**
@@ -63,7 +73,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
      * @param purchaseCode 生产单号
      * @return 构建完毕的BO对象
      */
-    private BulkOrderList initBulkOrderListBo(OrderListBo orderList, String sysNo, String purchaseCode) {
+    private BulkOrderList initBulkOrderList(OrderListBo orderList, String sysNo, String purchaseCode) {
         BulkOrderList bulkOrderList = new BulkOrderList();
         //设置系统单号
         bulkOrderList.setSysNo(sysNo);
@@ -80,7 +90,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         //设置默认单位ID
         bulkOrderList.setDefaultUnit(5);
         //设置大货编号
-        bulkOrderList.setGoodsTypeExtend1Id(orderList.getDaHuoNumberBo().getName());
+        bulkOrderList.setGoodsTypeExtend1Id(orderList.getDaHuoNumberName());
         //设置成衣厂
         bulkOrderList.setGarmentFactory(orderList.getGarmentFactory());
         //设置成衣厂联系人
@@ -101,10 +111,10 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         bulkOrderList.setBaseClothPrice(orderList.getBaseClothPrice());
         //设置品牌组
         bulkOrderList.setBrandGroup(orderList.getBrandGroup());
-        //设置工艺类型并转换为JSON格式后存入
-        bulkOrderList.setGoodsTypeExtend3Attr(JsonUtils.toJsonString(orderList.getCraft()));
+        //设置工艺类型
+        bulkOrderList.setGoodsTypeExtend3Id(orderList.getCraftId());
         //设置花型号类型并转换为JSON格式存入
-        bulkOrderList.setGoodsTypeExtend4Attr(JsonUtils.toJsonString(orderList.getOem()));
+        bulkOrderList.setGoodsTypeExtend4Id(orderList.getOemId());
         return bulkOrderList;
     }
 
@@ -115,7 +125,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
      * @param purchaseCode 生产单号
      * @return 构建完毕的生产计划BO对象
      */
-    private ProductionPlan initProductionPlanBo(OrderListBo orderList, String sysNo, String purchaseCode, String orderNumber) {
+    private ProductionPlan initProductionPlan(NewBulkOrderBo newBulkOrderBo, OrderListBo orderList, String sysNo, String purchaseCode, String orderNumber) {
         ProductionPlan productionPlan = new ProductionPlan();
         //设置系统单号
         productionPlan.setSysNo(sysNo);
@@ -124,7 +134,7 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         //设置订单单号
         productionPlan.setOrderNum(orderNumber);
         //设置用户id
-        productionPlan.setUserId(orderList.getUserId());
+        productionPlan.setUserId(newBulkOrderBo.getUserId());
         //设置是否烧花
         productionPlan.setIsBurnFlowers(orderList.getIsBurnFlowers());
         //设置是否快返
@@ -142,22 +152,22 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         //设置是否系统单
         productionPlan.setIsSys(orderList.getIsSys());
         //设置创建时间
-        productionPlan.setCreateTime(orderList.getCreateTime());
+        productionPlan.setCreateTime(newBulkOrderBo.getCreateTime());
         return productionPlan;
     }
 
-    private List<UserOrderTemplate> initUserOrderTemplate(OrderListBo orderList, Long orderId, Long planId) {
+    private List<UserOrderTemplate> initUserOrderTemplate(NewBulkOrderBo newBulkOrderBo, OrderListBo orderList, Long orderId, Long planId) {
         ArrayList<UserOrderTemplate> userOrderTemplateList = new ArrayList<>();
         for (TemplateBo templateBo : orderList.getTemplateList()) {
             UserOrderTemplate userOrderTemplate = new UserOrderTemplate();
             //设置用户id
-            userOrderTemplate.setUserId(orderList.getUserId());
+            userOrderTemplate.setUserId(newBulkOrderBo.getUserId());
             //设置订单id 对应fa_kuyou_user_order表id
             userOrderTemplate.setOrderId(orderId);
             //设置生产计划id 对应fa_kuyou_production_plan表id
             userOrderTemplate.setPlanId(planId);
             //设置大货编号id
-            userOrderTemplate.setItemId(orderList.getDaHuoNumberBo().getId());
+            userOrderTemplate.setItemId(orderList.getDaHuoNumberId());
             //设置份数
             userOrderTemplate.setNumber(templateBo.getNumber());
             //设置米数
@@ -170,4 +180,23 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
         }
         return userOrderTemplateList;
     }
+
+    private UserOrder initUserOrder(NewBulkOrderBo newBulkOrderBo, OrderListBo orderList, String orderNumber, String remark) {
+        UserOrder userOrder = new UserOrder();
+        //设置用户id
+        userOrder.setUserId(newBulkOrderBo.getUserId());
+        //设置订单名称
+        userOrder.setName(newBulkOrderBo.getUserName());
+        //设置订单电话
+        userOrder.setPhone(newBulkOrderBo.getUserPhone());
+        //设置订单地址
+        userOrder.setAddress(orderList.getReceivingAddress());
+        //设置订单编号
+        userOrder.setOrderNumber(orderNumber);
+        //设置备注
+        userOrder.setRemark(remark);
+        //设置创建时间
+        userOrder.setCreateTime(newBulkOrderBo.getCreateTime());
+        return userOrder;
+    }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/ProductionPlan.java

@@ -2,15 +2,13 @@ package org.dromara.productionManagement.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+
 @TableName("fa_kuyou_plan")
-public class ProductionPlan extends TenantEntity {
+public class ProductionPlan {
 
     /**
      * 主键

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ProductionPlanBo.java

@@ -2,16 +2,14 @@ package org.dromara.productionManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+
 @AutoMapper(target = ProductionPlan.class, reverseConvertGenerate = false)
-public class ProductionPlanBo extends BaseEntity {
+public class ProductionPlanBo{
 
     /**
      * 主键

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/ProductionPlanVo.java

@@ -2,16 +2,14 @@ package org.dromara.productionManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
+
 @AutoMapper(target = ProductionPlan.class)
-public class ProductionPlanVo extends BaseEntity {
+public class ProductionPlanVo{
 
     /**
      * 主键