Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java

@@ -251,7 +251,7 @@ public class BusSalesOrderConstantUtils {
         /**
          * 载货车
          */
-        TRUCK("005", "载货车"),
+        TRUCK("5", "载货车"),
         /**
          * 牵引车
          */

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

@@ -162,6 +162,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
@@ -5617,6 +5618,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 unCollectionDto.setKxState("01");
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                //==========================================================
+                if(new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0){//首付款及费用若为0
+                    //判断认款是否已认完，若已认完，则更新车辆状态为交清。
+
+                }
             }
         }
     }
@@ -7510,12 +7516,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrderBorrower != null) {
             return rb.setMsg("客户本人已存在贷款人中");
         }
+        //查询客户本人的资方信审状态是否通过
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
+        String customerSid = busSalesOrder.getCustomerSid();
+        LoanPreloanCreditApply loanPreloanCreditApply = busSalesOrderBorrowerService.selectLoanApply(customerSid);
+        if(loanPreloanCreditApply != null){
+            if(!"001".equals(loanPreloanCreditApply.getZffkjgKey())){
+                return rb.setMsg("该客户资方审核未通过或未审核，请处理后再操作");
+            }
+        }
         busSalesOrderBorrower = new BusSalesOrderBorrower();
         busSalesOrderBorrower.setSalesOrderSid(saleOrderSid);
         busSalesOrderBorrower.setCustomSid(busSalesOrder.getCustomerSid());
         busSalesOrderBorrower.setBorrowerName(busSalesOrder.getCustomerName());
         busSalesOrderBorrower.setMobile(busSalesOrder.getMobile());
+        LoanFinPolicy loanFinPolicy = busSalesOrderBorrowerService.selectBySid(saleOrderSid);
+        if (loanFinPolicy != null) {
+            busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
+            busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
+            busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
+        }
         busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
         return rb.success();
     }

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

@@ -94,4 +94,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
     BusSalesOrderBorrower selectByOrderSids(String saleOrderSid);
 
     LoanPreloanCreditApply selectByCr(String sid);
+
+    LoanPreloanCreditApply selectLoanApply(String customerSid);
 }

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

@@ -90,4 +90,11 @@
         from anrui_riskcenter.loan_preloan_credit_apply
         where sid = #{sid}
     </select>
+
+    <select id="selectLoanApply"
+            resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
+        select *
+        from anrui_riskcenter.loan_preloan_credit_apply
+        where custSid = #{sid} order by id desc limit 1
+    </select>
 </mapper>

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

@@ -174,6 +174,10 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success();
     }
 
+    public LoanFinPolicy selectBySid(String saleOrderSid){
+        return baseMapper.selectBySid(saleOrderSid);
+    }
+
     /**
      * 公司非担保业务进度维护
      *
@@ -308,4 +312,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
     public BusSalesOrderBorrower selectOrderSid(String saleOrderSid) {
         return baseMapper.selectByOrderSids(saleOrderSid);
     }
+
+    public LoanPreloanCreditApply selectLoanApply(String customerSid) {
+        return baseMapper.selectLoanApply(customerSid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -444,6 +444,7 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
             flowProcessMapQuery.setProDefKey(busValcustFiling.getProcDefId());
         }
         flowProcessMapQuery.setVariables(variables);
+        flowProcessMapQuery.setContractNo(busValcustFiling.getContractNo());
         variables = flowableFeign.getMap(flowProcessMapQuery).getData();
         //=======================================
         bv.setFormVariables(variables);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java

@@ -883,7 +883,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService<FinFu
                 } else {
                     collectionDetailDtoMany.setExTaxMoney(tzDto.getDcje().toString());
                 }
-                collectionDetailDtoOne.setUseTo("YT018");
+                collectionDetailDtoMany.setUseTo("YT018");
                 collectionDetailDtoListMany.add(collectionDetailDtoMany);
                 otherReceivableMany.setCollectionDetails(collectionDetailDtoListMany);
                 otherReceivableBillService.otherReceivableBillService(otherReceivableMany);