Merge remote-tracking branch 'origin/master'

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

@@ -76,6 +76,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -1405,7 +1406,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ExecutorService pool = new ThreadPoolExecutor(2, 100,
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-           /* Future<String> future1 = pool.submit(() -> {
+           Future<String> future1 = pool.submit(() -> {
                 return genCarSaleContract(dto, map, appOrderDetailsVo);
             });
             PrintConfirmVo printConfirmVo = null;
@@ -1433,7 +1434,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get());
                 list.add(printConfirmVo);
                 url = url + "," + future2.get();
-            }*/
+            }
             //生成合同数据
             //根据销售订单sid查询合同表中是否存在
             CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@@ -1,12 +1,10 @@
 package com.yxt.anrui.buscenter.api.busdeposit;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 @Data
@@ -34,10 +32,10 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     private String payDate;
 
     @ApiModelProperty("付款方式")
-    private String payType;
+    private String payTypeKey;
 
     @ApiModelProperty("付款方式")
-    private String payTypeValue;
+    private String payType;
 
     @ApiModelProperty("付款人")
     private String payName;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.common.enums.DictCommonEnum;
-import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
@@ -222,9 +221,11 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
             vo.setDepositBillType(busMainDeposit.getDepositBillType());
             vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
             BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
-            vo.setCustomerName(vehicleCustomerVo.getCustomerName());
-            vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
-            vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            if(vehicleCustomerVo != null){
+                vo.setCustomerName(vehicleCustomerVo.getCustomerName());
+                vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
+                vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            }
             vo.setStaffName(busMainDeposit.getStaffName());
             vo.setDepartmentName(busMainDeposit.getOrgName());
             vo.setVirtualOrderSid(query.getVirtualOrderSid());
@@ -281,12 +282,14 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
         //查询客户信息
         BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
-        vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
-        vo.setCustomerName(vehicleCustomerVo.getCustomerName());
-        vo.setMobile(vehicleCustomerVo.getCustomerMobile());
-        vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto());
-        vo.setCustomerClass(vehicleCustomerVo.getCustomerClass());
-        vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey());
+        if(vehicleCustomerVo != null){
+            vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
+            vo.setCustomerName(vehicleCustomerVo.getCustomerName());
+            vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto());
+            vo.setCustomerClass(vehicleCustomerVo.getCustomerClass());
+            vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey());
+        }
         vo.setStaffName(busMainDeposit.getStaffName());
         vo.setDepartmentName(busMainDeposit.getOrgName());
         vo.setUpdateStateUrl("未确定字段");

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -693,14 +693,15 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                         }
                     }
                 }
-
             } else if (record.getVirtualOrderType().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
                 int count = baseMapper.selByBillSidCount(virtualOrderSid);
                 record.setCarNumber(String.valueOf(count));
-                record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
-                record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
-                record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
+                if(busDepositVehicleCustomer != null){
+                    record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
+                    record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
+                    record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
+                }
             }
             // 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止
             if ("待提交".equals(record.getVirtualOrderState())) {
@@ -1909,6 +1910,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     public ResultBean submitVirtualVehicleOrder(SubmitVirtualOrderVehicleDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if(StringUtils.isBlank(dto.getCustomerSid())){
+            return rb.setMsg("客户不能为空");
+        }
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
         if (!userVoResultBean.getSuccess()) {

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

@@ -236,6 +236,10 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 }
 
                 for (AppBusSalesOrderDepositListDto listDto : listVos) {
+                    //查询结转金额是否小于可用金额
+                    if(new BigDecimal(listDto.getPrice()).compareTo(new BigDecimal(listDto.getDepositPrice()))<0){
+                        return rb.setMsg("结转金额不允许大于订金剩余金额");
+                    }
                     //查询付款人是否和客户一样
                     BusDeposit busDeposit = busDepositService.selectByBillSid(listDto.getDepositBillSid());
                     if (!busSalesOrder.getCustomerName().equals(busDeposit.getDraweeName())) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java

@@ -1,6 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit;
 
-import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,10 +27,12 @@ public class DepositBuscenterDetailVo implements Vo {
     private String payDate;
 
     @ApiModelProperty("付款方式")
-    private String payType;
+    @JsonProperty("payType")
+    private String payTypeKey;
 
     @ApiModelProperty("付款方式")
-    private String payTypeValue;
+    @JsonProperty("payTypeValue")
+    private String payType;
 
     @ApiModelProperty("付款人")
     private String payName;