Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CommonContractEnum.java

@@ -14,7 +14,8 @@ public class CommonContractEnum {
         /**
          * 新车买卖合同
          */
-        XC_CONTRACT("001", "新车买卖合同（订车、现车、欠款）");
+        DC_CONTRACT("010", "新车买卖合同（订车）"),
+        XC_CONTRACT("009", "新车买卖合同（现车）");
 
         /**
          * code值

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -1379,8 +1379,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 //合同编号
                 commonContract.setContractNo(contractNo);
                 //合同类型
-                commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode());
-                commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks());
+                if("现车".equals(appOrderDetailsVo.getOrderType())){
+                    commonContract.setContractTypeKey(CommonContractEnum.contractType.XC_CONTRACT.getCode());
+                    commonContract.setContractType(CommonContractEnum.contractType.XC_CONTRACT.getRemarks());
+                }else{
+                    commonContract.setContractTypeKey(CommonContractEnum.contractType.DC_CONTRACT.getCode());
+                    commonContract.setContractType(CommonContractEnum.contractType.DC_CONTRACT.getRemarks());
+                }
                 //客户sid
                 commonContract.setCustomerSid(appOrderDetailsVo.getCustomerSid());
                 //业务员sid、业务员

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitious.java

@@ -56,8 +56,8 @@ public class BusDepositFictitious extends BaseEntity {
     private String depositBillNo;
 	@ApiModelProperty("订金信息sid")
     private String depositSid;
-	@ApiModelProperty("订金剩余金额")
-    private BigDecimal depositPrice;
+	/*@ApiModelProperty("订金剩余金额")
+    private BigDecimal depositPrice;*/
 	@ApiModelProperty("本次结转金额")
     private BigDecimal price;
 	@ApiModelProperty("款项支付委托书")

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

@@ -49,6 +49,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
@@ -995,9 +996,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     listVos.removeAll(Collections.singleton(null));
                     if (!listVos.isEmpty()) {
                         for (AppBusSalesOrderDepositListVo listVo : listVos) {
+                            //添加负的记录
+                            BusDepositFictitious busDepositFictitious = new BusDepositFictitious();
+                            BeanUtil.copyProperties(listVo, busDepositFictitious, "sid");
+                            busDepositFictitious.setPrice(new BigDecimal(listVo.getPayMoney()).negate());
+                            busDepositFictitious.setDepositSid(busSalesOrderDeposit.getSid());
+                            busDepositFictitious.setDepositBillNo(listVo.getVirtualOrderId());
+                            busDepositFictitious.setDepositBillSid(listVo.getVirtualOrderSid());
+                            busDepositFictitiousService.save(busDepositFictitious);
                             //查询该虚拟订金单已使用的订金值
                             String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
-                            depositAll = new BigDecimal(depositAll).subtract(new BigDecimal(listVo.getPayMoney())).toString();
                             //更新该虚拟订单的订金值
                             busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
                         }