From 0f7509ae1dd4b27f4f8fdddf813d8b387b6503dc Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 5 May 2022 16:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDepositFictitiousMapper.java           |  2 +
 .../BusDepositFictitiousMapper.xml            | 32 ++++++---
 .../BusDepositFictitiousService.java          | 11 +++
 .../bussalesorder/BusSalesOrderService.java   | 68 ++++++++++++++++++-
 .../BusSalesOrderDepositMapper.java           |  2 +
 .../BusSalesOrderDepositMapper.xml            | 32 ++++++---
 .../BusSalesOrderDepositService.java          | 10 +++
 .../BusSalesOrderDiscountMapper.java          |  2 +
 .../BusSalesOrderDiscountMapper.xml           | 32 ++++++---
 .../BusSalesOrderDiscountService.java         |  2 +
 .../BusSalesOrderInsuranceMapper.java         | 20 +++---
 .../BusSalesOrderInsuranceMapper.xml          | 33 ++++++---
 .../BusSalesOrderInsuranceService.java        |  4 ++
 .../BusSalesOrderMakeupMapper.java            |  2 +
 .../BusSalesOrderMakeupMapper.xml             | 32 ++++++---
 .../BusSalesOrderMakeupService.java           |  4 ++
 .../BusSalesOrderPriceMapper.java             | 20 +++---
 .../BusSalesOrderPriceMapper.xml              | 32 ++++++---
 .../BusSalesOrderPriceService.java            | 12 ++++
 19 files changed, 278 insertions(+), 74 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java
index eabf588975..ed2c710bcd 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java
@@ -62,4 +62,6 @@ public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictiti
 	
 	@Select("select * from bus_deposit_fictitious")
 	List<BusDepositFictitiousVo> selectListVo();
+
+    int deleteByOrderSid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
index a272f7bead..d5b16f0284 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo">
-		SELECT * FROM bus_deposit_fictitious <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo">
-		SELECT * FROM bus_deposit_fictitious <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo">
+        SELECT *
+        FROM bus_deposit_fictitious
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo">
+        SELECT *
+        FROM bus_deposit_fictitious
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_deposit_fictitious
+        where depositSid = #{sid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
index ba8d256204..0a40a36f16 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java
@@ -29,10 +29,13 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.*;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
+import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -52,6 +55,9 @@ import java.util.List;
  */
 @Service
 public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFictitiousMapper, BusDepositFictitious> {
+
+    @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()));
@@ -88,4 +94,9 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
             baseMapper.insert(busDepositFictitious);
         }
     }
+
+    public int deleteByOrderSid(String sid) {
+       BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
+        return baseMapper.deleteByOrderSid(busSalesOrderDeposit.getSid());
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index a91a49d6d7..4a3656799e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -164,10 +164,73 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //新增
             save(dto);
         } else {
+            updateOrder(dto);
+        }
+        return rb.success();
+    }
 
+    private void updateOrder(BusSalesOrderAllDto dto) {
+        //主车车型信息
+        BusSalesOrderModelDto busSalesOrderModelDto = dto.getBusSalesOrderModel();
+        //现车车辆信息
+        List<BusSalesOrderVehicleDto> list = dto.getBusSalesOrderVehicleList();
+        //采购订单信息
+        List<BusSalesVehicleOrderDto> vehicleList = dto.getBusSalesVehicleOrderList();
+        //上装配置信息
+        BusSalesOrderMakeupDto busSalesOrderMakeupDto = dto.getBusSalesOrderMakeup();
+        //价格信息
+        BusSalesOrderPriceDto busSalesOrderPriceDto = dto.getBusSalesOrderPrice();
+        //主车优惠明细
+        List<BusSalesOrderDiscountDto> busSalesOrderDiscountDto = dto.getBusSalesOrderDiscountList();
+        //保险说明
+        BusSalesOrderInsuranceDto busSalesOrderInsuranceDto = dto.getBusSalesOrderInsurance();
+        //订金信息
+        BusSalesOrderDepositDto busSalesOrderDepositDto = dto.getBusSalesOrderDeposit();
+        //虚拟订单和订金关联信息
+        List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
+        BusSalesOrder busSalesOrder = fetchBySid(dto.getSid());
+        BeanUtil.copyProperties(dto, busSalesOrder, "sid");
+        baseMapper.updateById(busSalesOrder);
+        //主车车型信息保存
+        busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
+        if ("1".equals(dto.getType())) {
+            //现车车辆信息
+            busSalesOrderVehicleService.saveVehicle(list, dto.getSid());
+        } else if ("2".equals(dto.getType())) {
+            //采购订单信息
+            busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid());
         }
-        //ToDo:未完结
-        return null;
+        //是否含有上装信息
+        String isTop = dto.getIsTop();
+        if ("1".equals(isTop)) {
+            //删除上装信息
+            busSalesOrderMakeupService.deleteBySalesOrderSid(dto.getSid());
+            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid());
+        } else {
+            //删除上装信息
+            busSalesOrderMakeupService.deleteBySalesOrderSid(dto.getSid());
+        }
+        //价格信息
+        busSalesOrderPriceService.updateOrderPrice(busSalesOrderPriceDto, dto.getSid());
+        //主车优惠明细
+        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid());
+        //是否有保险说明
+        String isInsurance = dto.getIsInsurance();
+        if ("1".equals(isInsurance)) {
+            busSalesOrderInsuranceService.deleteByOrderSid(dto.getSid());
+            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid());
+        } else {
+            busSalesOrderInsuranceService.deleteByOrderSid(dto.getSid());
+        }
+        busSalesOrderDepositService.updateOrderDepo(busSalesOrderDepositDto, dto.getSid());
+        if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
+            //现交订金
+            busDepositFictitiousService.deleteByOrderSid(dto.getSid());
+            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid());
+        } else {
+            busDepositFictitiousService.deleteByOrderSid(dto.getSid());
+        }
+
     }
 
     public void save(BusSalesOrderAllDto dto) {
@@ -191,6 +254,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
         BusSalesOrder busSalesOrder = new BusSalesOrder();
         BeanUtil.copyProperties(dto, busSalesOrder, "sid");
+        baseMapper.insert(busSalesOrder);
         //主车车型信息保存
         busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
         if ("1".equals(dto.getType())) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java
index e733128599..0e84c17846 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java
@@ -62,4 +62,6 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
 	
 	@Select("select * from bus_sales_order_deposit")
 	List<BusSalesOrderDepositVo> selectListVo();
+
+    BusSalesOrderDeposit selectByOrderSid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
index 05f75ff05f..e859cc6509 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo">
-		SELECT * FROM bus_sales_order_deposit <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo">
-		SELECT * FROM bus_sales_order_deposit <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo">
+        SELECT *
+        FROM bus_sales_order_deposit
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo">
+        SELECT *
+        FROM bus_sales_order_deposit
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit">
+        select *
+        from bus_sales_order_discount
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index 31b0548166..2f38f77372 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -84,4 +84,14 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
         baseMapper.insert(busSalesOrderDeposit);
     }
+
+    public void updateOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
+        BusSalesOrderDeposit busSalesOrderDeposit = baseMapper.selectByOrderSid(sid);
+        BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
+        baseMapper.updateById(busSalesOrderDeposit);
+    }
+
+    public BusSalesOrderDeposit selectByOrderSid(String sid) {
+        return baseMapper.selectByOrderSid(sid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java
index 0fcd4f06d6..fb34976f0e 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java
@@ -62,4 +62,6 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDis
 	
 	@Select("select * from bus_sales_order_discount")
 	List<BusSalesOrderDiscountVo> selectListVo();
+
+    int deleteList(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
index e1f1933fad..71e83bd273 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo">
-		SELECT * FROM bus_sales_order_discount <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo">
-		SELECT * FROM bus_sales_order_discount <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo">
+        SELECT *
+        FROM bus_sales_order_discount
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo">
+        SELECT *
+        FROM bus_sales_order_discount
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <delete id="deleteList">
+        delete
+        from bus_sales_order_discount
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java
index ca79e9372e..3778f0e509 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java
@@ -82,6 +82,8 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
     }
 
     public void saveDiscount(List<BusSalesOrderDiscountDto> busSalesOrderDiscountList, String sid) {
+        //删除原有的
+        baseMapper.deleteList(sid);
         for (int i = 0; i < busSalesOrderDiscountList.size(); i++) {
             BusSalesOrderDiscount busSalesOrderDiscount = new BusSalesOrderDiscount();
             BeanUtil.copyProperties(busSalesOrderDiscountList.get(i), busSalesOrderDiscount, "sid");
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
index a3725069b1..0afa464d46 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java
@@ -53,13 +53,15 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderInsurance> {
 
-	//@Update("update bus_sales_order_insurance set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderInsuranceVo> voPage(IPage<BusSalesOrderInsurance> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderInsurance> qw);
-	
-	IPage<BusSalesOrderInsuranceVo> selectPageVo(IPage<BusSalesOrderInsurance> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderInsurance> qw);
-	
-	List<BusSalesOrderInsuranceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderInsurance> qw);
-	
-	@Select("select * from bus_sales_order_insurance")
-	List<BusSalesOrderInsuranceVo> selectListVo();
+    //@Update("update bus_sales_order_insurance set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderInsuranceVo> voPage(IPage<BusSalesOrderInsurance> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderInsurance> qw);
+
+    IPage<BusSalesOrderInsuranceVo> selectPageVo(IPage<BusSalesOrderInsurance> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderInsurance> qw);
+
+    List<BusSalesOrderInsuranceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderInsurance> qw);
+
+    @Select("select * from bus_sales_order_insurance")
+    List<BusSalesOrderInsuranceVo> selectListVo();
+
+    int deleteByOrderSid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
index 2b9577a67b..a2b54ed16c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml
@@ -1,13 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo">
-		SELECT * FROM bus_sales_order_insurance <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo">
-		SELECT * FROM bus_sales_order_insurance <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo">
+        SELECT *
+        FROM bus_sales_order_insurance
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo">
+        SELECT *
+        FROM bus_sales_order_insurance
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <delete id="deleteByOrderSid">
+        delete
+        from bus_sales_order_insurance
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
index 9538aa67e2..72eebc2c5c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java
@@ -78,4 +78,8 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
         BeanUtil.copyProperties(busSalesOrderInsuranceDto, busSalesOrderInsurance, "sid");
         baseMapper.insert(busSalesOrderInsurance);
     }
+
+    public int deleteByOrderSid(String sid) {
+        return baseMapper.deleteByOrderSid(sid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
index 452a51ebd4..4fcaa5ea44 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java
@@ -62,4 +62,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
 	
 	@Select("select * from bus_sales_order_makeup")
 	List<BusSalesOrderMakeupVo> selectListVo();
+
+    int deleteBySalesOrderSid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
index a3a9ccfba7..b36ff863f7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
-		SELECT * FROM bus_sales_order_makeup <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
-		SELECT * FROM bus_sales_order_makeup <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
+        SELECT *
+        FROM bus_sales_order_makeup
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
+        SELECT *
+        FROM bus_sales_order_makeup
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <delete id="deleteBySalesOrderSid">
+        delete
+        from bus_sales_order_makeup
+        where salesOrderSid = #{sid}
+    </delete>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
index 9aaa673a48..4d9eaf18c4 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java
@@ -84,4 +84,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
         BeanUtil.copyProperties(busSalesOrderMakeupDto, busSalesOrderMakeup, "sid");
         baseMapper.insert(busSalesOrderMakeup);
     }
+
+    public int deleteBySalesOrderSid(String sid) {
+        return baseMapper.deleteBySalesOrderSid(sid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java
index a38c292e4f..fcfaf56970 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java
@@ -53,13 +53,15 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice> {
 
-	//@Update("update bus_sales_order_price set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderPriceVo> voPage(IPage<BusSalesOrderPrice> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderPrice> qw);
-	
-	IPage<BusSalesOrderPriceVo> selectPageVo(IPage<BusSalesOrderPrice> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderPrice> qw);
-	
-	List<BusSalesOrderPriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderPrice> qw);
-	
-	@Select("select * from bus_sales_order_price")
-	List<BusSalesOrderPriceVo> selectListVo();
+    //@Update("update bus_sales_order_price set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderPriceVo> voPage(IPage<BusSalesOrderPrice> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderPrice> qw);
+
+    IPage<BusSalesOrderPriceVo> selectPageVo(IPage<BusSalesOrderPrice> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderPrice> qw);
+
+    List<BusSalesOrderPriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderPrice> qw);
+
+    @Select("select * from bus_sales_order_price")
+    List<BusSalesOrderPriceVo> selectListVo();
+
+    BusSalesOrderPrice selectBySalesOrderSid(String sid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
index e6aeae385e..9c34aa08a7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml
@@ -1,13 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo">
-		SELECT * FROM bus_sales_order_price <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo">
-		SELECT * FROM bus_sales_order_price <where> ${ew.sqlSegment} </where>
-	</select>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo">
+        SELECT *
+        FROM bus_sales_order_price
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo">
+        SELECT *
+        FROM bus_sales_order_price
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectBySalesOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice">
+        select *
+        from bus_sales_order_price
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
index a9827acfb1..8f3c3e7784 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java
@@ -84,4 +84,16 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         busSalesOrderPrice.setSingleFinalPrice(finalPriceAll);
         baseMapper.insert(busSalesOrderPrice);
     }
+
+    public void updateOrderPrice(BusSalesOrderPriceDto busSalesOrderPriceDto, String sid) {
+        //根据销售订单sid查询价格信息
+        BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectBySalesOrderSid(sid);
+        BeanUtil.copyProperties(busSalesOrderPriceDto,busSalesOrderPrice,"sid");
+        BigDecimal guildPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleGuildPrice());
+        busSalesOrderPrice.setSingleGuildPrice(guildPriceAll);
+        BigDecimal finalPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleFinalPrice());
+        busSalesOrderPrice.setSingleFinalPrice(finalPriceAll);
+        baseMapper.updateById(busSalesOrderPrice);
+
+    }
 }
\ No newline at end of file