Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -183,7 +183,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation("重新发起")
     @GetMapping("/rePublishSaleOrder")
     @ResponseBody
-    public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid")String saleOrderSid,@RequestParam(value = "customerSid",required = false)String customerSid,@RequestParam(value = "customerName",required = false)String customerName,@RequestParam(value = "customerMobile",required = false)String customerMobile) throws InvocationTargetException, IllegalAccessException;
+    public ResultBean rePublishSaleOrder(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam(value = "customerSid", required = false) String customerSid, @RequestParam(value = "customerName", required = false) String customerName, @RequestParam(value = "customerMobile", required = false) String customerMobile) throws InvocationTargetException, IllegalAccessException;
 
     /**
      * 新增保存销售订单信息
@@ -350,5 +350,5 @@ public interface BusSalesOrderFeign {
     @ApiOperation("根据销售订单查询销售订单相关表")
     @GetMapping("/getSalesOrderOne")
     @ResponseBody
-    ResultBean<BusSalesOrdersVo> getSalesOrderOne(@RequestParam("sid")String sid);
+    ResultBean<BusSalesOrdersVo> getSalesOrderOne(@RequestParam("sid") String sid);
 }

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

@@ -22,4 +22,6 @@ public class VinListVo2 {
     private int viewType;
     @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
     private String groupName;
+
+    private String pos;
 }

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

@@ -7286,12 +7286,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrderVehicleList.removeAll(Collections.singleton(null));
         List<String> borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList());
         List<VinListVo2> vinList = new ArrayList<>();
+        int pos = 0;
         for (int j = 0; j < borrowSidList.size(); j++) {
             VinListVo2 vinListVo2 = new VinListVo2();
             String borrowSid = borrowSidList.get(j);
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
             if (type == 1) {
                 vinListVo2.setViewType(0);
+                pos = pos + 1;
+                vinListVo2.setPos(String.valueOf(pos));
             } else if (type == 2) {
                 vinListVo2.setViewType(1);
                 String borrowName = busSalesOrderVehicle.getBorrowName();
@@ -7302,9 +7305,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
             vinList.add(vinListVo2);
-            if(StringUtils.isNotBlank(borrowSid)){
+            if (StringUtils.isNotBlank(borrowSid)) {
                 busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
-            }else{
+            } else {
                 busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid3(saleOrderSid);
             }
 
@@ -7313,6 +7316,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
                     vinListVo2 = new VinListVo2();
                     vinListVo2.setViewType(0);
+                    pos = pos + 1;
+                    vinListVo2.setPos(String.valueOf(pos));
                     busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
                     if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
                         vinListVo2.setLinkNo(busSalesOrderVehicle.getLinkNo());

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -227,4 +227,8 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         }
         return rb.success().setData(xsfjImages);
     }
+
+    public void getOrderPush(){
+
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -585,10 +585,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             loanOrderPreloanVo.setConfirmBtn("信用审核");
             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
         } else {
-            if ("1".equals(loanPreloanCreditApply.getState())) {
+            if (loanPreloanCreditApply.getState() == 1) {
                 loanOrderPreloanVo.setConfirmBtn("信用审核");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
-            } else if ("0".equals(loanPreloanCreditApply.getState())) {
+            } else if (loanPreloanCreditApply.getState() == 0) {
                 loanOrderPreloanVo.setConfirmBtn("我知道了");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
             } else {

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

@@ -23,4 +23,6 @@ public class BusVinNoVo2 {
     private int viewType;
     @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
     private String groupName;
+    @ApiModelProperty("车架号的序号")
+    private String pos;
 }