移动端修复

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java

@@ -37,4 +37,7 @@ public class AppBusSalesOrderDepositListVo implements Vo {
 
     @ApiModelProperty("已使用订金")
     private String usedDeposit;
+
+    @ApiModelProperty("订金使用记录sid")
+    private String useDepositRecordSid;
 }

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

@@ -43,7 +43,8 @@
                bf.price         as payMoney,
                bf.payPath,
                bd2.usedDeposit,
-               bd2.deposit
+               bd2.deposit,
+               bf.sid           as useDepositRecordSid
         from bus_deposit_fictitious bf
                  left join bus_main_deposit bd on bd.sid = bf.depositBillSid
                  left join bus_deposit bd2 on bf.depositBillSid = bd2.billSid

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
@@ -90,9 +91,11 @@ public class FinPaymentapplyDto implements Dto {
 
     private List<FinPaymentapplyVehicleDto> vehicleList;
     @ApiModelProperty("是否涉及车辆，1是，0否")
+    @NotBlank(message = "请选择是否涉及车辆")
     private String isVeh;
 
     @ApiModelProperty(value = "品牌sid")
+    @NotBlank(message = "请选择品牌")
     private String carBrandSid;
     @ApiModelProperty(value = "品牌名称")
     private String carBrandName;

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -171,7 +171,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         if (StringUtils.isBlank(dtoSid)) {
             //=======================================
             String orgSidPath = dto.getOrgSidPath();
-            if(StringUtils.isBlank(orgSidPath)){
+            if (StringUtils.isBlank(orgSidPath)) {
                 //根据用户sid获取staffSid
                 ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid());
                 if (!userVoResultBean.getSuccess()) {
@@ -194,13 +194,21 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             finPaymentapply.setCreateOrgSid(createOrgSid);
             finPaymentapply.setUseOrgSid(createOrgSid);
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
-            String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+            if (detailsList != null && detailsList.size() > 0) {
+                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+                finPaymentapply.setPaymentTotal(new BigDecimal(i));
+            }
+
             if ("1".equals(dto.getIsVeh())) {
                 List<FinPaymentapplyVehicleDto> vehicleDtoList = dto.getVehicleList();
-                String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid());
-                finPaymentapply.setCarTotal(new BigDecimal(j));
+                if (vehicleDtoList != null && vehicleDtoList.size() > 0) {
+                    String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid());
+                    finPaymentapply.setCarTotal(new BigDecimal(j));
+                } else {
+                    return rb.setMsg("请添加车辆信息");
+                }
             }
-            finPaymentapply.setPaymentTotal(new BigDecimal(i));
+
             baseMapper.insert(finPaymentapply);
             dtoSid = finPaymentapply.getSid();
         } else {
@@ -208,18 +216,24 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             if (finPaymentapply == null) {
                 return rb.setMsg("该付款申请不存在");
             }
-            BeanUtil.copyProperties(dto, finPaymentapply,"orgSidPath");
+            BeanUtil.copyProperties(dto, finPaymentapply, "orgSidPath");
 
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
-            String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+            if (detailsList != null && detailsList.size() > 0) {
+                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid());
+                finPaymentapply.setPaymentTotal(new BigDecimal(i));
+            }
+
             if ("1".equals(dto.getIsVeh())) {
                 List<FinPaymentapplyVehicleDto> vehicleDtoList = dto.getVehicleList();
-                String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid());
-                finPaymentapply.setCarTotal(new BigDecimal(j));
+                if (vehicleDtoList != null && vehicleDtoList.size() > 0) {
+                    String j = finPaymentapplyVehicleService.saveVehicleList(vehicleDtoList, finPaymentapply.getSid());
+                    finPaymentapply.setCarTotal(new BigDecimal(j));
+                }
             } else {
                 finPaymentapplyVehicleService.deleteVehicle(dtoSid);
             }
-            finPaymentapply.setPaymentTotal(new BigDecimal(i));
+
             baseMapper.updateById(finPaymentapply);
         }
         return rb.success().setData(dtoSid);
@@ -447,20 +461,20 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 finPaymentrecordDto.setReceiveCompany(finPaymentapply.getReceiveCompany());
                 List<FinPaymentapplyDetailVo> detailVoList = vo.getDetailsList();
                 detailVoList.removeAll(Collections.singleton(null));
-                if(!detailVoList.isEmpty()){
-                    for (FinPaymentapplyDetailVo finPaymentapplyDetailVo : detailVoList){
+                if (!detailVoList.isEmpty()) {
+                    for (FinPaymentapplyDetailVo finPaymentapplyDetailVo : detailVoList) {
                         //收款银行账号
                         finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailVo.getReceivingAccount());
                         finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailVo.getBank());
                         //金额
-                        if(StringUtils.isNotBlank(finPaymentapplyDetailVo.getPayAccount())){
+                        if (StringUtils.isNotBlank(finPaymentapplyDetailVo.getPayAccount())) {
                             finPaymentrecordDto.setCost(Integer.valueOf(finPaymentapplyDetailVo.getPayAccount()));
                         }
                         finPaymentrecordService.saveDto(finPaymentrecordDto);
                     }
                 }
                 //到回款返利申请
-                if (finPaymentapply.getCostTitleValue().equals("车款")){
+                if (finPaymentapply.getCostTitleValue().equals("车款")) {
                     ScmCollectionRebateDto scmCollectionRebateDto = new ScmCollectionRebateDto();
                     List<ScmCollectionRebateVehDto> scmCollectionRebateVehDtos = new ArrayList<>();
                     List<FinPaymentapplyDetailVo> details = finPaymentapplyDetailsService.getDetails(finPaymentapply.getSid());
@@ -471,18 +485,18 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                     scmCollectionRebateDto.setCollectionTypeValue(details.get(0).getPaymentType());
                     scmCollectionRebateDto.setManufaSaleChannelValue(details.get(0).getActualPay());
                     scmCollectionRebateDto.setCollectionMoney(details.get(0).getPayAccount());
-                    scmCollectionRebateDto.setCollectionDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
+                    scmCollectionRebateDto.setCollectionDate(DateUtil.format(new Date(), "yyyy-MM-dd"));
                     scmCollectionRebateDto.setCreateOrgSid(finPaymentapply.getCreateOrgSid());
                     scmCollectionRebateDto.setUseOrgSid(finPaymentapply.getUseOrgSid());
-                    if (!vehicleList.isEmpty()){
+                    if (!vehicleList.isEmpty()) {
                         for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {
                             ScmCollectionRebateVehDto scmCollectionRebateVehDto = new ScmCollectionRebateVehDto();
                             BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(finPaymentapplyVehicleVo.getVehiSid()).getData();
                             scmCollectionRebateVehDto.setCarModelSid(finPaymentapplyVehicleVo.getModelSid());
                             scmCollectionRebateVehDto.setCarModelName(finPaymentapplyVehicleVo.getModelName());
-                            scmCollectionRebateVehDto.setPriceDate(DateUtil.format(baseVehicleSelectVo.getPriceDate(),"yyyy-MM-dd"));
-                            if (baseVehicleSelectVo.getSalesDate() != null){
-                                scmCollectionRebateVehDto.setSalesDate(DateUtil.format(baseVehicleSelectVo.getSalesDate(),"yyyy-MM-dd"));
+                            scmCollectionRebateVehDto.setPriceDate(DateUtil.format(baseVehicleSelectVo.getPriceDate(), "yyyy-MM-dd"));
+                            if (baseVehicleSelectVo.getSalesDate() != null) {
+                                scmCollectionRebateVehDto.setSalesDate(DateUtil.format(baseVehicleSelectVo.getSalesDate(), "yyyy-MM-dd"));
                             }
                             scmCollectionRebateVehDto.setVehSid(finPaymentapplyVehicleVo.getVehiSid());
                             scmCollectionRebateVehDto.setVinNo(finPaymentapplyVehicleVo.getVinNo());

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysuser/SysUserQuery.java

@@ -46,6 +46,6 @@ public class SysUserQuery implements Query {
     private String appId;
     @ApiModelProperty("手机登录类型：1、密码登录2、验证码登录")
     private String type;
-    @ApiModelProperty("是否是测试")
-    private boolean isTest;
+    @ApiModelProperty(value = "是否是测试",example = "false")
+    private Boolean isTest;
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/app/AppSysUserRest.java

@@ -81,7 +81,7 @@ public class AppSysUserRest implements AppSysUserFeign {
             if (StringUtils.isBlank(verifyCode)) return new ResultBean<SysUserVo>().fail().setMsg("验证码不能为空");
             // 访问后清理key
         }
-        boolean isTest = userQuery.isTest();
+        boolean isTest = userQuery.getIsTest();
         if (isTest) {//添加测试版
             SysUser sysUser = sysUserService.selectByUserNameApp(userName);
             if (sysUser == null) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java

@@ -28,4 +28,6 @@ public class DepositInfoListVo implements Vo {
     private List<String> entrustImage = new ArrayList<>();
 
     private Boolean showImage;
+    @ApiModelProperty("订金使用记录sid")
+    private String useDepositRecordSid;
 }