fix:完善删除逻辑

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

@@ -119,43 +119,43 @@ public class OrderListBo {
     /**
      * 烧花,0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isBurnFlowers = 0;
 
     /**
      * 快返,0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isQuickReturn = 0;
 
     /**
      * 作废0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isToVoid = 0;
 
     /**
      * 复色，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isMulticolor = 0;
 
     /**
      * 首单，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isFirstOrder = 0;
 
     /**
      * 加急，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isUrgent = 0;
 
     /**
      * 补货，0否，1是
      */
-    @Size(max = 1,message = "0否，1是")
+    @Size(max = 1,message = "超出范围，0否，1是")
     private int isBuhuo = 0;
 
     /**

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/BulkOrderListMapper.java

@@ -23,8 +23,11 @@ public interface BulkOrderListMapper extends BaseMapperPlus<BulkOrderList, BulkO
      */
     Page<BulkOrderListVo> selectVoPageWithImage(IPage<BulkOrderListVo> page, @Param(Constants.WRAPPER) Wrapper<BulkOrderList> wrapper);
 
-
-
+    /**
+     * 获取指定的计划表id
+     * @return 计划表id
+     */
+    Long selectPlanId(Long id);
 }
 
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/FlowerPatternMapper.java

@@ -5,6 +5,15 @@ import org.dromara.bulk.domain.FlowerPattern;
 import org.dromara.bulk.domain.vo.FlowerPatternVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
+/**
+ * 图片关联表 Mapper
+ */
 @Mapper
 public interface FlowerPatternMapper extends BaseMapperPlus<FlowerPattern, FlowerPatternVo> {
+    /**
+     * 根据订单id删除图片关联表
+     * @param userOrderId 用户订单Id
+     * @return 行数
+     */
+    int deleteByUserOrderId(Long userOrderId);
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/UserOrderMapper.java

@@ -10,4 +10,10 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface UserOrderMapper extends BaseMapperPlus<UserOrder, UserOrderVo> {
+    /**
+     * 根据订单编号获取用户订单表Id
+     * @param orderNumber 订单编号
+     * @return 行数
+     */
+    Long selectIdByOrderNumber(String orderNumber);
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/UserOrderTemplateMapper.java

@@ -10,4 +10,5 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  */
 @Mapper
 public interface UserOrderTemplateMapper extends BaseMapperPlus<UserOrderTemplate, UserOrderTemplateVo> {
+    int deleteByPlanId(Long planId);
 }

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

@@ -6,14 +6,17 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.BulkOrderList;
 import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
-import org.dromara.bulk.mapper.*;
-import org.dromara.bulk.mapstruct.NewBulkOrderMapstruct;
+import org.dromara.bulk.mapper.BulkOrderListMapper;
+import org.dromara.bulk.mapper.FlowerPatternMapper;
+import org.dromara.bulk.mapper.UserOrderMapper;
+import org.dromara.bulk.mapper.UserOrderTemplateMapper;
 import org.dromara.bulk.service.BulkOrderListService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -27,11 +30,8 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     private final BulkOrderListMapper bulkOrderListMapper;
     private final UserOrderMapper userOrderMapper;
     private final UserOrderTemplateMapper userOrderTemplateMapper;
-    private final AttachmentMapper attachmentMapper;
     private final FlowerPatternMapper flowerPatternMapper;
 
-    private final NewBulkOrderMapstruct newBulkOrderMapstruct;
-
     /**
      * 查询大货订单列表分页信息
      * @param bulkOrderListBo 大货订单BO对象
@@ -57,14 +57,26 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     }
 
     /**
-     * 删除大货订单
+     * 删除大货订单及所属数据
      * @param bulkOrderListIds 大货订单ID数组
      * @return 删除行数
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
         for (Long bulkOrderListId : bulkOrderListIds) {
+            Long planId = bulkOrderListMapper.selectPlanId(bulkOrderListId);
+            if (null == planId){
+                return 0;
+            }
+            String orderNUmber = productionPlanMapper.selectOrderNumberById(planId);
+            Long userOrderId = userOrderMapper.selectIdByOrderNumber(orderNUmber);
 
+            bulkOrderListMapper.deleteById(bulkOrderListId);
+            productionPlanMapper.deleteById(planId);
+            userOrderMapper.deleteById(userOrderId);
+            flowerPatternMapper.deleteByUserOrderId(userOrderId);
+            userOrderTemplateMapper.deleteByPlanId(planId);
         }
         return 1;
     }

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

@@ -1,7 +1,6 @@
 package org.dromara.bulk.service.impl;
 
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.dromara.bulk.domain.*;
 import org.dromara.bulk.domain.bo.AttachmentBo;
 import org.dromara.bulk.domain.bo.FlowerPatternBo;
@@ -25,7 +24,6 @@ import java.util.List;
 /**
  * 大货订单管理服务层实现
  */
-@Slf4j
 @Service
 @RequiredArgsConstructor
 public class BulkOrderManagementServiceImpl implements BulkOrderManagementService {
@@ -132,7 +130,6 @@ public class BulkOrderManagementServiceImpl implements BulkOrderManagementServic
             }
             return 1;
         } catch (Exception e) {
-            log.error("插入生产订单失败: {}", e.getMessage(), e);
             throw new RuntimeException("插入生产订单失败", e);
         }
     }

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/BulkOrderListMapper.xml

@@ -119,4 +119,7 @@
             fa_kuyou_flower_pattern fp ON uo.id = fp.user_order_id
             ${ew.getCustomSqlSegment()}
     </select>
+    <select id="selectPlanId" resultType="java.lang.Long">
+        SELECT plan_id FROM fa_kuyou_plan_info WHERE id = #{id}
+    </select>
 </mapper>

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/FlowerPatternMapper.xml

@@ -3,4 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.FlowerPatternMapper">
+    <delete id="deleteByUserOrderId">
+        DELETE FROM fa_kuyou_flower_pattern WHERE user_order_id = #{userOrderId}
+    </delete>
 </mapper>

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/UserOrderMapper.xml

@@ -3,4 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.UserOrderMapper">
+    <select id="selectIdByOrderNumber" resultType="java.lang.Long">
+        SELECT id FROM fa_kuyou_user_order WHERE order_num = #{orderNumber}
+    </select>
 </mapper>

ruoyi-modules/ruoyi-bulkOrder/src/main/resources/mapper/UserOrderTemplateMapper.xml

@@ -3,4 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.bulk.mapper.UserOrderTemplateMapper">
+    <delete id="deleteByPlanId">
+        DELETE FROM fa_kuyou_user_order_template WHERE plan_id = #{planId}
+    </delete>
 </mapper>

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/mapper/ProductionPlanMapper.java

@@ -10,4 +10,10 @@ import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
  */
 @Mapper
 public interface ProductionPlanMapper extends BaseMapperPlus<ProductionPlan, ProductionPlanVo> {
+    /**
+     * 根据id查询订单编号
+     * @param id id
+     * @return 订单编号
+     */
+    String selectOrderNumberById(Long id);
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/resources/mapper/ProductionPlanMapper.xml

@@ -3,4 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.productionManagement.mapper.ProductionPlanMapper">
+    <select id="selectOrderNumberById" resultType="java.lang.String">
+        SELECT order_num FROM fa_kuyou_plan WHERE id = #{id}
+    </select>
 </mapper>