销售订单-完善编辑及编辑初始化

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

@@ -29,7 +29,6 @@ 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;
@@ -98,8 +97,7 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
     }
 
     public int deleteByOrderSid(String sid) {
-        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
+        return baseMapper.deleteByDepositSid(sid);
-        return baseMapper.deleteByDepositSid(busSalesOrderDeposit.getSid());
     }
 
     /**

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

@@ -280,12 +280,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setBusSalesOrderDiscountList(busSalesOrderDiscountDetailsVoList);
         }
         //查询保险说明
-        if ("1".equals(entity.getIsInsurance())) {
+
         BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.details(entity.getSid());
         if (busSalesOrderInsuranceDetailsVo != null) {
             vo.setBusSalesOrderInsurance(busSalesOrderInsuranceDetailsVo);
         }
-        }
+
         //查询订金信息
         BusSalesOrderDepositDetailsVo busSalesOrderDepositDetailsVo = busSalesOrderDepositService.details(entity.getSid());
         if (busSalesOrderDepositDetailsVo != null) {
@@ -514,14 +514,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
         }
         busSalesOrderDepositService.updateOrderDepo(busSalesOrderDepositDto, dto.getSid());
-        if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
+        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(dto.getSid());
-            //现交订金
+        if(busSalesOrderDeposit != null){
-            busDepositFictitiousService.deleteByOrderSid(dto.getSid());
+            if ("02".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
-            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid());
+                //结转金额
+                busDepositFictitiousService.deleteByOrderSid(busSalesOrderDeposit.getSid());
+                busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, busSalesOrderDeposit.getSid());
             } else {
-            busDepositFictitiousService.deleteByOrderSid(dto.getSid());
+                busDepositFictitiousService.deleteByOrderSid(busSalesOrderDeposit.getSid());
+            }
         }
 
+
     }
 
     public String save(BusSalesOrderAllDto dto) {