Merge remote-tracking branch 'origin/master'

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

@@ -2238,10 +2238,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if ("0".equals(busSalesOrder.getIsInsurance())) {
                 vo.setInsuranceInfo("未在公司入保" + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks());
             } else if ("1".equals(busSalesOrder.getIsInsurance())) {
-                String x = ",";
-                String x1 = "单台车保费预估金额：";
-                String x2 = "入保期数：";
-                vo.setInsuranceInfo(busSalesOrderInsurance.getInsuranceName()+":" + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum() + "期");
+                String x = "、";
+                String x1 = "单台车保费预估金额（元）：";
+                String x2 = "公司入保期数：";
+                String info = "公司投保、保险公司名称：" + busSalesOrderInsurance.getInsuranceName() + x + x1 + busSalesOrderInsurance.getInsuranceCarMoney() + "元" + x + x2 + busSalesOrderInsurance.getInsuranceNum();
+                if (StringUtils.isNotBlank(busSalesOrderInsurance.getRemarks())) {
+                    info = info + "\n\n" + "备注：" + busSalesOrderInsurance.getRemarks();
+                }
+                vo.setInsuranceInfo(info);
             }
         } else {
             if ("0".equals(busSalesOrder.getIsInsurance())) {

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

@@ -244,6 +244,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             if ("01".equals(dto.getDepositTypeKey())) {
                 //将需补交订金设置为null
                 baseMapper.updateMakeUpDeposit(depositSid);
+
+            }
             //查询该订金信息的结转信息中已结转的，再加回至简易订金单的已使用订金中
             //根据订金sid查询虚拟订单和订金的关联
             List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
@@ -258,7 +260,6 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 }
             }
         }
-        }
         List<AppBusSalesOrderDepositListVo> list = busDepositFictitiousService.getList(depositSid);
         list.removeAll(Collections.singleton(null));
         if (list.size() > 0) {