优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,8 +14,12 @@ import java.util.List;
 @Data
 public class VinListVo2 {
 
-    @ApiModelProperty("贷款人")
-    private String borrowName;
-    private String borrowSid;
-    private List<VinListVo> vinList;
+    @ApiModelProperty("是否已出库")
+    private Boolean state;
+    private String linkNo;
+    private String linkSid;
+    @ApiModelProperty("车架号是0，标题是1，全款时全是0，贷款时，有贷款人的是1，其他分组人也是1")
+    private int viewType;
+    @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
+    private String groupName;
 }

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

@@ -7272,6 +7272,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
         ResultBean<VinVo2> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        int type = 0;
+        if (busSalesOrder != null) {
+            if ("1".equals(busSalesOrder.getPayTypeKey())) {
+                type = 1;//全款
+            } else {
+                type = 2;//贷款
+            }
+        }
         VinVo2 vinVo = new VinVo2();
         List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid);
         busSalesOrderVehicleList.removeAll(Collections.singleton(null));
@@ -7281,21 +7290,30 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             VinListVo2 vinListVo2 = new VinListVo2();
             String borrowSid = borrowSidList.get(j);
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
-            String borrowName = busSalesOrderVehicle.getBorrowName();
-            vinListVo2.setBorrowName(borrowName);
-            vinListVo2.setBorrowSid(borrowSid);
+            if (type == 1) {
+                vinListVo2.setViewType(0);
+            } else if (type == 2) {
+                vinListVo2.setViewType(1);
+                String borrowName = busSalesOrderVehicle.getBorrowName();
+                if (StringUtils.isNotBlank(borrowSid)) {
+                    vinListVo2.setGroupName("贷款人:" + borrowName);
+                } else {
+                    vinListVo2.setGroupName("贷款人:不确定贷款人");
+                }
+            }
+            vinList.add(vinListVo2);
             busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
             busSalesOrderVehicleList.removeAll(Collections.singleton(null));
             if (!busSalesOrderVehicleList.isEmpty()) {
-                List<VinListVo> vinList2 = new ArrayList<>();
                 for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
+                    vinListVo2 = new VinListVo2();
+                    vinListVo2.setViewType(0);
                     busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
-                    VinListVo vinListVo = new VinListVo();
                     if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                        vinListVo.setLinkNo(busSalesOrderVehicle.getLinkNo());
+                        vinListVo2.setLinkNo(busSalesOrderVehicle.getLinkNo());
                     }
                     if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
-                        vinListVo.setLinkSid(busSalesOrderVehicle.getLinkSid());
+                        vinListVo2.setLinkSid(busSalesOrderVehicle.getLinkSid());
                     }
                     if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
                         //根据车架号查询是否已出库
@@ -7304,18 +7322,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
                             if (vo != null) {
                                 if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
-                                    vinListVo.setState(true);
+                                    vinListVo2.setState(true);
                                 } else {
-                                    vinListVo.setState(false);
+                                    vinListVo2.setState(false);
                                 }
                             }
                         }
                     }
-                    vinList2.add(vinListVo);
+                    vinList.add(vinListVo2);
                 }
-                vinListVo2.setVinList(vinList2);
             }
-            vinList.add(vinListVo2);
         }
         vinVo.setSaleOrderSid(saleOrderSid);
         vinVo.setVinList(vinList);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyVo.java

@@ -97,4 +97,7 @@ public class LoanFinPolicyVo implements Vo {
     private String discountUseType;
     @ApiModelProperty("贴息放款类型key")
     private String discountUseTypeKey;
+
+    private List<String> vehTypeKeyList;
+    private List<String> vehTypeValueList;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -269,6 +269,14 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
             return rb.setMsg("该金融产品政策不存在");
         }
         BeanUtil.copyProperties(loanFinPolicy, loanFinPolicyVo);
+        if (StringUtils.isNotBlank(loanFinPolicyVo.getVehTypeKey())) {
+            List<String> listKey = Arrays.asList(loanFinPolicyVo.getVehTypeKey().split(","));
+            loanFinPolicyVo.setVehTypeKeyList(listKey);
+        }
+        if (StringUtils.isNotBlank(loanFinPolicyVo.getVehTypeValue())) {
+            List<String> listValue = Arrays.asList(loanFinPolicyVo.getVehTypeValue().split(","));
+            loanFinPolicyVo.setVehTypeValueList(listValue);
+        }
         loanFinPolicyVo.setOrgPath(loanFinPolicy.getOrgSidPath());
         loanFinPolicyVo.setUserSid(loanFinPolicy.getCreateBySid());
         if (loanFinPolicy.getIsOtherProduct() == 1) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/BusVinNoVo2.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,8 +13,14 @@ import java.util.List;
  **/
 @Data
 public class BusVinNoVo2 {
-    @ApiModelProperty("贷款人")
-    private String borrowName;
-    private String borrowSid;
-    private List<BusVinNoVo> vinList;
+    @ApiModelProperty("是否已出库")
+    private Boolean state;
+    @JsonProperty("vin")
+    private String linkNo;
+    @JsonProperty("carSid")
+    private String linkSid;
+    @ApiModelProperty("车架号是0，标题是1，全款时全是0，贷款时，有贷款人的是1，其他分组人也是1")
+    private int viewType;
+    @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
+    private String groupName;
 }