修复移动端销售订单修改数量后，订金合计以及价格合计更新

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

@@ -2021,7 +2021,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     /**
-     * 验证销售顶大是否可提交
+     * 验证销售订单是否可提交
      *
      * @param sid 销售订单sid
      * @return
@@ -2071,6 +2071,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 return rb.setMsg("当前车型已发生变化，请进行确认");
             }
         }
+        //验证总订金是否正确
+        ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
         return rb.success();
     }
 

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

@@ -38,6 +38,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppDepositListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -96,4 +97,6 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
     AppOrderDepositInfoVo selectDeposit(String sid);
 
     List<String> selectByTotalValue(String sid);
+
+    int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid);
 }

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

@@ -49,7 +49,7 @@
                bd.draweeName   as payName,
                bd.draweeMobile as mobile,
                bd.deposit,
-               bd.usedDeposit as usePeposit
+               bd.usedDeposit  as usePeposit
         from bus_main_deposit bmd
                  left join bus_deposit bd on bd.billSid = bmd.sid
         <where>
@@ -71,7 +71,7 @@
     </update>
 
     <select id="selectDeposit" resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo">
-        select deposit, depositAll as depositTotal, sid, depositTypeKey,depositType as type,makeUpDeposit
+        select deposit, depositAll as depositTotal, sid, depositTypeKey, depositType as type, makeUpDeposit
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>
@@ -81,4 +81,10 @@
         from bus_sales_order_discount
         where salesOrderSid = #{sid}
     </select>
+
+    <update id="updateBySalesOrderSid">
+        update bus_sales_order_deposit
+        set depositAll = #{depositSum}
+        where salesOrderSid = #{orderSid}
+    </update>
 </mapper>

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

@@ -355,4 +355,15 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public List<String> selectByTotalValue(String sid) {
         return baseMapper.selectByTotalValue(sid);
     }
+
+    /**
+     * 根据销售订单sid更新订金信息的订金合计
+     *
+     * @param depositSum    订金合计
+     * @param salesOrderSid 销售订单sid
+     * @return
+     */
+    public int updateBySalesOrderSid(BigDecimal depositSum, String salesOrderSid) {
+        return baseMapper.updateBySalesOrderSid(depositSum, salesOrderSid);
+    }
 }

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

@@ -30,6 +30,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
@@ -41,6 +42,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
+import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
@@ -82,6 +84,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     private BusSalesOrderMakeupService busSalesOrderMakeupService;
     @Autowired
     private BaseVehicleModelFeign baseVehicleModelFeign;
+    @Autowired
+    private BusSalesOrderDepositService busSalesOrderDepositService;
 
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@@ -170,7 +174,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             }
         } else {
             BeanUtil.copyProperties(orderInfo, busSalesOrderModel, "sid");
-            if(StringUtils.isNotBlank(dto.getGuildPrice())){
+            if (StringUtils.isNotBlank(dto.getGuildPrice())) {
                 busSalesOrderModel.setGuildPrice(new BigDecimal(dto.getGuildPrice()));
             }
             busSalesOrderModel.setBrandSid(brandSid);
@@ -226,10 +230,26 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             busSalesOrderPrice.setSingleGuildPrice(bigDecimalPrice);
             busSalesOrderPriceService.save(busSalesOrderPrice);
         } else {
-            busSalesOrderPriceService.updateBySalesSid(num, salesOrderSid, bigDecimalPrice);
+            //重新计算车价合计
+            BigDecimal priceSum = new BigDecimal("0");
+            if (busSalesOrderPrice.getSingleFinalPrice() != null) {
+                priceSum = busSalesOrderPrice.getSingleFinalPrice().multiply(new BigDecimal(num));
+            }
+            busSalesOrderPriceService.updateBySalesSid(num, salesOrderSid, bigDecimalPrice, priceSum);
         }
         //更新销售订单的车辆类型
         busSalesOrderService.updateTypeBySid(type, salesOrderSid);
+        //查询订金信息
+        AppOrderDepositInfoVo depositInfo = busSalesOrderDepositService.selectDeposit(salesOrderSid);
+        if (depositInfo != null) {
+            BigDecimal depositSum = new BigDecimal("0");
+            if (StringUtils.isNotBlank(depositInfo.getDeposit())) {
+                depositSum = new BigDecimal(depositInfo.getDeposit()).multiply(new BigDecimal(num));
+            }
+            //更新订金的订金合计
+            busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid);
+
+        }
         return rb.success().setMsg("成功");
     }
 

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

@@ -74,7 +74,7 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
      */
     int deleteByOrderSid(String sid);
 
-    int updateBySalesSid(@Param("num") int num, @Param("sid") String salesOrderSid, @Param("price") BigDecimal price);
+    int updateBySalesSid(@Param("num") int num, @Param("sid") String salesOrderSid, @Param("price") BigDecimal price,@Param("priceSum") BigDecimal priceSum);
 
     /**
      * 根据销售订单sid查询销售订单的价格信息

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

@@ -30,7 +30,8 @@
     <update id="updateBySalesSid">
         update bus_sales_order_price
         set quantity         = #{num},
-            singleGuildPrice = #{price}
+            singleGuildPrice = #{price},
+            priceSum         = #{priceSum}
         where salesOrderSid = #{sid}
     </update>
 

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

@@ -120,8 +120,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         return baseMapper.selectBySalesOrderSid(salesOrderSid);
     }
 
-    public int updateBySalesSid(int num, String salesOrderSid, BigDecimal price) {
-        return baseMapper.updateBySalesSid(num, salesOrderSid, price);
+    public int updateBySalesSid(int num, String salesOrderSid, BigDecimal price,BigDecimal priceSum) {
+        return baseMapper.updateBySalesSid(num, salesOrderSid, price,priceSum);
     }
 
     public ResultBean<AppBusSalesOrderPriceVo> getPriceInfo(String sid) {