销售订单删除接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -64,7 +64,7 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<String> save(@RequestBody BusSalesOrderAllDto dto);
 
-    @ApiOperation("根据sid删除记录")
+    @ApiOperation("删除/批量删除")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java

@@ -64,7 +64,13 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
     @Select("select * from bus_deposit_fictitious")
     List<BusDepositFictitiousVo> selectListVo();
 
-    int deleteByOrderSid(String sid);
+    /**
+     * 根据订金sid删除虚拟订单和订金关联的信息
+     *
+     * @param sid 订金sid
+     * @return
+     */
+    int deleteByDepositSid(String sid);
 
     /**
      * 根据订金sid查询虚拟订单和订金的信息
@@ -73,4 +79,6 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
      * @return
      */
     List<BusDepositFictitiousDetailsVo> detailsList(String sid);
+
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -18,13 +18,13 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
-    <delete id="deleteByOrderSid">
+    <!--根据订金sid删除虚拟订单和订金关联信息-->
+    <delete id="deleteByDepositSid">
         delete
         from bus_deposit_fictitious
         where depositSid = #{sid}
     </delete>
-
+    <!--根据订金sid查询虚拟订单和订金关联信息-->
     <select id="detailsList"
             resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo">
         select depositBillNo,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -58,6 +58,7 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
 
     @Autowired
     private BusSalesOrderDepositService busSalesOrderDepositService;
+
     private QueryWrapper<BusDepositFictitious> createQueryWrapper(BusDepositFictitiousQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -96,16 +97,27 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
     }
 
     public int deleteByOrderSid(String sid) {
-       BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
-        return baseMapper.deleteByOrderSid(busSalesOrderDeposit.getSid());
+        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
+        return baseMapper.deleteByDepositSid(busSalesOrderDeposit.getSid());
     }
 
     /**
      * 根据订金sid查询虚拟订单和订金的信息
+     *
      * @param sid 订金sid
      * @return
      */
     public List<BusDepositFictitiousDetailsVo> detailsList(String sid) {
         return baseMapper.detailsList(sid);
     }
+
+    /**
+     * 根据订金sid删除虚拟订单和订金信息关联信息
+     *
+     * @param sid 订金sid
+     * @return
+     */
+    public int deleteByDepositSid(String sid) {
+        return baseMapper.deleteByDepositSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -63,26 +63,26 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
      * @return
      */
     @Override
-    public ResultBean<PagerVo<BusSalesOrderVo>> listPage(@RequestBody PagerQuery<BusSalesOrderQuery> pq) {
+    public ResultBean<PagerVo<BusSalesOrderVo>> listPage(PagerQuery<BusSalesOrderQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BusSalesOrderVo> pv = busSalesOrderService.listPageVo(pq);
         return rb.success().setData(pv);
     }
 
+    /**
+     * 新增或修改
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     @Override
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
     public ResultBean<String> save(@RequestBody BusSalesOrderAllDto dto) {
         return busSalesOrderService.saveOrUpdateOrder(dto);
     }
 
     @Override
-    @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
-        busSalesOrderService.delBySids(sids);
-        return rb.success();
+    public ResultBean delBySids(String[] sids) {
+        return busSalesOrderService.deleteSids(sids);
     }
 
     /**

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
@@ -76,7 +77,9 @@ import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -543,4 +546,53 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         int i = baseMapper.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
         return i;
     }
+
+    /**
+     * 删除/批量删除销售订单
+     *
+     * @param sids 销售订单数组
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean deleteSids(String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        List<String> sidsList = Arrays.asList(sids);
+        if (sidsList.size() == 0) {
+            return rb.setMsg("请选择要删除的数据");
+        }
+        for (int i = 0; i < sidsList.size(); i++) {
+            String sid = sidsList.get(i);
+            BusSalesOrder busSalesOrder = fetchBySid(sid);
+            //删除销售订单主表
+            deleteBySid(sid);
+            //删除主车车型信息
+            busSalesOrderModelService.deleteByOrderSid(sid);
+            if ("1".equals(busSalesOrder.getType())) {
+                //删除现车车辆信息
+                busSalesOrderVehicleService.deleteByOrderSid(sid);
+            }
+            if ("2".equals(busSalesOrder.getType())) {
+                //删除采购订单信息
+                busSalesVehicleOrderService.deleteByOrderSid(sid);
+            }
+            if ("1".equals(busSalesOrder.getIsTop())) {
+                //删除上装配置信息
+                busSalesOrderMakeupService.deleteBySalesOrderSid(sid);
+            }
+            //删除价格信息
+            busSalesOrderPriceService.deleteByOrderSid(sid);
+            //删除主车优惠
+            busSalesOrderDiscountService.deleteByOrderSid(sid);
+            if ("1".equals(busSalesOrder.getIsInsurance())) {
+                //删除保险信息
+                busSalesOrderInsuranceService.deleteByOrderSid(sid);
+            }
+            BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
+            busSalesOrderDepositService.deleteByOrderSid(sid);
+            if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+            }
+        }
+        return rb.success().setMsg("删除成功");
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java

@@ -73,4 +73,12 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
      * @return
      */
     BusSalesOrderDepositDetailsVo details(String sid);
+
+    /**
+     * 根据销售订单sid删除订金信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    int deleteByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -35,4 +35,10 @@
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>
+
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_order_deposit
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -104,4 +104,14 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public BusSalesOrderDepositDetailsVo details(String sid) {
         return baseMapper.details(sid);
     }
+
+    /**
+     * 根据销售订单sid删除订金信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java

@@ -73,4 +73,12 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDis
      * @return
      */
     List<BusSalesOrderDiscountDetailsVo> detailsList(String sid);
+
+    /**
+     * 根据销售订单sid删除主车优惠明细
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    int deleteByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml

@@ -36,4 +36,10 @@
         from bus_sales_order_discount
         where salesOrderSid = #{sid}
     </select>
+    <!--根据销售订单sid删除主车优惠明细-->
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_order_discount
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -100,4 +100,14 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
     public List<BusSalesOrderDiscountDetailsVo> detailsList(String sid) {
         return baseMapper.detailsList(sid);
     }
+
+    /**
+     * 根据销售订单sid查询主车优惠明细
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -64,6 +64,12 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
     @Select("select * from bus_sales_order_makeup")
     List<BusSalesOrderMakeupVo> selectListVo();
 
+    /**
+     * 根据销售订单sid删除上装配置信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
     int deleteBySalesOrderSid(String sid);
 
     /**

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -18,16 +18,24 @@
             ${ew.sqlSegment}
         </where>
     </select>
-
+    <!--根据销售订单删除该销售订单的上装配置-->
     <delete id="deleteBySalesOrderSid">
         delete
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </delete>
     <!--根据销售订单sid查询上装配置-->
-    <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
-        select
-
+    <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo">
+        select topName,
+               refitMethod,
+               refitFactory,
+               overallDimension,
+               plateMaterial,
+               plateThickness,
+               announcementModel,
+               topPrice,
+               moreConfig,
+               contractPath
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -85,10 +85,22 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
         baseMapper.insert(busSalesOrderMakeup);
     }
 
+    /**
+     * 根据销售订单sid删除上装配置信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
     public int deleteBySalesOrderSid(String sid) {
         return baseMapper.deleteBySalesOrderSid(sid);
     }
 
+    /**
+     * 根据销售订单sid查询上装配置信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
     public BusSalesOrderMakeupDetailsVo details(String sid) {
         return baseMapper.details(sid);
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java

@@ -73,4 +73,12 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
      * @return
      */
     BusSalesOrderModelDetailsVo details(String sid);
+
+    /**
+     * 根据销售订单sid删除该销售订单的主车车型信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    int deleteByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -24,7 +24,7 @@
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>
-
+    <!--根据销售订单sid查询主车车型信息-->
     <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo">
         select modelSid,
                modelConfigSid,
@@ -38,4 +38,10 @@
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>
+    <!--删除该销售订单的主车车型-->
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_order_model
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -104,4 +104,13 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     public BusSalesOrderModelDetailsVo details(String sid) {
         return baseMapper.details(sid);
     }
+
+    /**
+     * 根据销售订单sid删除该销售订单的主车车型信息
+     *
+     * @param sid 销售订单sid
+     */
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java

@@ -76,4 +76,12 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
      * @return
      */
     BusSalesOrderPriceDetailsVo details(String sid);
+
+    /**
+     * 根据销售订单sid删除销售订单的价格信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    int deleteByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -24,7 +24,7 @@
         from bus_sales_order_price
         where salesOrderSid = #{sid}
     </select>
-
+    <!--根据销售订单sid查询价格信息-->
     <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo">
         select singleFinalPrice,
                singleGuildPrice,
@@ -35,4 +35,10 @@
         from bus_sales_order_price
         where salesOrderSid = #{sid}
     </select>
+    <!--根据销售订单sid删除价格信息-->
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_order_price
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -110,4 +110,14 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     public BusSalesOrderPriceDetailsVo details(String sid) {
         return baseMapper.details(sid);
     }
+
+    /**
+     * 根据销售订单sid删除订单的价格信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -75,4 +75,12 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
      * @return
      */
     List<BusSalesOrderVehicleDetailsVo> detailsList(String sid);
+
+    /**
+     * 根据销售订单sid删除该销售订单的现车车辆信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    int deleteByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -39,4 +39,10 @@
         from bus_sales_order_vehicle
         where salesOrderSid = #{sid}
     </select>
+    <!--根据销售订单sid删除该销售订单的现车车辆信息-->
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -98,4 +98,13 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public List<BusSalesOrderVehicleDetailsVo> detailsList(String sid) {
         return baseMapper.detailsList(sid);
     }
+
+    /**
+     * 根据销售订单sid删除该销售订单下的现车车辆信息
+     * @param sid 销售订单sid
+     * @return
+     */
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -75,4 +75,12 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
      * @return
      */
     List<BusSalesVehicleOrderDetailsVo> detailsList(String sid);
+
+    /**
+     * 根据销售订单sid删除该销售订单的采购订单信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    int deleteByOrderSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -39,4 +39,10 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </select>
+    <!--根据销售订单sid删除该销售订单的采购订单信息-->
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -104,4 +104,14 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     public List<BusSalesVehicleOrderDetailsVo> detailsList(String sid) {
         return baseMapper.detailsList(sid);
     }
+
+    /**
+     * 根据销售订单sid删除该销售订单的采购订单信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }