Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -100,14 +100,14 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setCarryInvoiceState("1");
                 } else if (BaseVehicleStateEnum.OperateTypeEnum.QKKPZZ.getTypeKey().equals(operateType)) {
                     baseVehicleState.setCarryInvoiceState("0");
-                }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZB.getTypeKey().equals(operateType)){
+                }/*else if (BaseVehicleStateEnum.OperateTypeEnum.JFZB.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusNo(BaseVehicleStateEnum.BusNoEnum.JF.getBusNoKey());
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZB.getStateKey());
                 }else if (BaseVehicleStateEnum.OperateTypeEnum.JFKC.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFKC.getStateKey());
                 }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZLSH.getStateKey());
-                }
+                }*/
                 baseMapper.updateById(baseVehicleState);
             } else {
                 if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java

@@ -51,6 +51,11 @@ public interface LoanFinOtherPolicyFeign {
     @ApiOperation("获取产品政策下其他融，或分公司下其他融")
     ResultBean<List<OtherPolicyVo>> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period);
 
+
+    @GetMapping("selectList2")
+    @ApiOperation("移动端产品政策下其他融")
+    ResultBean<List<OtherPolicyVo>> selectList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid ,@RequestParam(value = "period", required = false) String period);
+
     @ApiOperation("使用状态停用、开启:useState为1时走停用，为0时走开启")
     @PostMapping("setState")
     ResultBean setState(@RequestBody LoanFinOtherPolicyStateQuery query);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyRest.java

@@ -54,6 +54,11 @@ public class LoanFinOtherPolicyRest implements LoanFinOtherPolicyFeign {
         return loanFinOtherPolicyService.selectList(orgPath,userSid,sid,name,modelSid ,period);
     }
 
+    @Override
+    public ResultBean<List<OtherPolicyVo>> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        return loanFinOtherPolicyService.selectList2(orgPath,userSid,sid,name,modelSid ,period);
+    }
+
     @Override
     public ResultBean setState(LoanFinOtherPolicyStateQuery query) {
         return loanFinOtherPolicyService.setState(query);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -109,6 +109,23 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         }
         return rb.success().setData(list);
 
+    }
+
+    public ResultBean<List<OtherPolicyVo>> selectList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        ResultBean<List<OtherPolicyVo>> rb = ResultBean.fireFail();
+        if(StringUtils.isNotBlank(sid)){
+            List<OtherPolicyVo> list = baseMapper.selectListOne(sid, name);
+            list.removeAll(Collections.singleton(null));
+            if (list.isEmpty()) {
+                return rb.success().setData(new ArrayList<>());
+            }
+            return rb.success().setData(list);
+        }else{
+            return rb.success().setData(new ArrayList<>());
+        }
+
+
+
     }
 
     public PagerVo<LoanFinOtherPolicyPageVo> listPageVo(PagerQuery<LoanFinOtherPolicyQuery> pq) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepMapper.xml

@@ -54,7 +54,6 @@
                bo.`staffName`,
                bo.`contractNo`,
                bb.`vehCount`,
-               bb.borrowerSid,
                bb.`borrowerName`,
                bb.`mobile`,
                bb.`bankName`,

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -1384,6 +1384,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //其他融贴息
             String otherDiscount = query.getOtherDiscount();
             if (StringUtils.isNotBlank(otherDiscount) && !"0".equals(otherDiscount)) {
+                loanDownPay = loanDownPay.subtract(new BigDecimal(otherPolicyAmount));
+                //总贷款金额的计算
+                loanAmountTotal = loanAmountTotal.add(new BigDecimal(otherPolicyAmount));
                 //根据年利率和期数、贷款金额计算旧月还
                 BigDecimal otherPolicyMonthlyRepay = BigDecimal.ZERO;
                 if(new BigDecimal(otherPolicyYearRatio).compareTo(BigDecimal.ZERO) == 0){

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/SolutionsFeign.java

@@ -45,11 +45,16 @@ public interface SolutionsFeign {
                                            @RequestParam(value = "name", required = false) String name,
                                            @RequestParam(value = "modelSid", required = false) String modelSid);
 
-    @ApiOperation("获取产品政策下其他融，或分公司下其他融")
+    @ApiOperation("获取分公司下其他融")
     @GetMapping("/selectOtherList")
     @ResponseBody
     ResultBean<List<OtherPolicysVo>> selectOtherList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period);
 
+    @ApiOperation("获取产品政策下其他融")
+    @GetMapping("/selectOtherList2")
+    @ResponseBody
+    ResultBean<List<OtherPolicysVo>> selectOtherList2(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid,@RequestParam(value = "period", required = false) String period);
+
     @ApiOperation("初始化金融方案2")
     @GetMapping("/selectDetailsVo2")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsRest.java

@@ -48,6 +48,11 @@ public class SolutionsRest implements SolutionsFeign {
         return solutionsService.selectOtherList(orgPath, userSid, sid, name,modelSid,period);
     }
 
+    @Override
+    public ResultBean<List<OtherPolicysVo>> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        return solutionsService.selectOtherList2(orgPath, userSid, sid, name,modelSid,period);
+    }
+
     @Override
     public ResultBean<AppSolutionVo> selectDetailsVo2(String busSid) {
         return solutionsService.selectDetailsVo2(busSid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/solutions/SolutionsService.java

@@ -132,4 +132,25 @@ public class SolutionsService {
         }
         return rb.success();
     }
+
+    public ResultBean<List<OtherPolicysVo>> selectOtherList2(String orgPath, String userSid, String sid, String name, String modelSid, String period) {
+        ResultBean<List<OtherPolicysVo>> rb = ResultBean.fireFail();
+        List<OtherPolicysVo> listNew = new ArrayList<>();
+        ResultBean<List<OtherPolicyVo>> resultBean = loanFinOtherPolicyFeign.selectList2(orgPath, userSid, sid, name, modelSid, period);
+        if (resultBean.getData() != null && !resultBean.getData().isEmpty()) {
+            List<OtherPolicyVo> list = resultBean.getData();
+            list.removeAll(Collections.singleton(null));
+            for (int i = 0; i < list.size(); i++) {
+                OtherPolicyVo policyVo = list.get(i);
+                OtherPolicyExtraVo extraVo = new OtherPolicyExtraVo();
+                OtherPolicysVo policysVo = new OtherPolicysVo();
+                policysVo.setId(policyVo.getSid());
+                policysVo.setDictValue(policyVo.getName());
+                BeanUtil.copyProperties(policyVo, extraVo);
+                policysVo.setExtra(extraVo);
+                listNew.add(policysVo);
+            }
+        }
+        return rb.success().setData(listNew);
+    }
 }