家访考察申诉通过后判断台数是否要修改贷款人和消贷合同状态为正常

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java

@@ -105,4 +105,9 @@ public interface BusSalesOrderBorrowerFeign {
     @PostMapping("/updateState")
     @ResponseBody
     ResultBean updateState(@RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid,@RequestParam("state") String state);
+
+    @ApiOperation("查询该销售订单已确定的数量")
+    @PostMapping("/selectByNum")
+    @ResponseBody
+    ResultBean<Integer> selectByNum(@RequestParam("saleOrderSid") String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java

@@ -99,4 +99,9 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         return null;
     }
+
+    @Override
+    public ResultBean<Integer> selectByNum(String saleOrderSid) {
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java

@@ -124,4 +124,11 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign {
     public ResultBean updateState(String saleOrderBorrowerSid, String state) {
         return busSalesOrderBorrowerService.updateState(saleOrderBorrowerSid, state);
     }
+
+    @Override
+    public ResultBean<Integer> selectByNum(String saleOrderSid) {
+        ResultBean rb = ResultBean.fireFail();
+        int num = busSalesOrderBorrowerService.selectByNum(saleOrderSid);
+        return rb.success().setData(num);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
 import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
@@ -123,9 +125,9 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
     @Autowired
     private FlowTaskFeign flowTaskFeign;
     @Autowired
-    private LoanHomevisitFileexamineService loanHomevisitFileexamineService;
-    @Autowired
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
+    private BusSalesOrderPriceFeign busSalesOrderPriceFeign;
 
     public PagerVo<LoanHomevisitAppealVo> listPageVo(PagerQuery<LoanHomevisitAppealQuery> pq) {
         LoanHomevisitAppealQuery query = pq.getParams();
@@ -498,8 +500,15 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                //修改贷款人状态为正常(1正常，0作废)
-                busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                //查询该销售订单已确定的数量
+                int count = busSalesOrderBorrowerFeign.selectByNum(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+                //查询销售订单价格中数量
+                AppBusSalesOrderPriceVo appBusSalesOrderPriceVo = busSalesOrderPriceFeign.getPriceInfo(loanHomevisitInvestigate.getSaleOrderSid()).getData();
+                int jgNum = Integer.parseInt(appBusSalesOrderPriceVo.getNumber());
+                if (count < jgNum){
+                    //修改贷款人状态为正常(1正常，0作废)
+                    busSalesOrderBorrowerFeign.updateState(loanHomevisitInvestigate.getSaleOrderBorrowerSid(), "1");
+                }
                 //修改家访考察为待考察，并清空考察结果
                 loanHomevisitInvestigateService.updateState(loanHomevisitInvestigate.getSid(), "1");
             } else {