Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/BankVoForPayment.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.fin.api.finmanufacturerbank;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/12/8 9:50
+ */
+@Data
+public class BankVoForPayment {
+    @ApiModelProperty("开户银行")
+    private String depositBank;
+    @ApiModelProperty("转付账户")
+    private String account;
+    @ApiModelProperty("转付账户账号")
+    private String accountNumber;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java

@@ -85,7 +85,7 @@ public interface FinManufacturerBankFeign {
     @ApiOperation("获取该分公司下的开户账号:切换机构")
     @GetMapping("/selectAccountByUseOrgSid")
     @ResponseBody
-    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@RequestParam("userSid") String userSid,@RequestParam("orgPath")String orgPath);
+    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
 
     @ApiOperation("获取该本分公司下的开户账号")
     @GetMapping("/selAccountByOrgSid")
@@ -96,4 +96,10 @@ public interface FinManufacturerBankFeign {
     @PostMapping("/selAppAccountByOrgSid")
     @ResponseBody
     public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(@RequestBody PagerQuery<FinManufacturerOrgPathQuery> query);
+
+    @ApiOperation("代收代付选择银行账户")
+    @GetMapping("/listByPayment")
+    @ResponseBody
+    public ResultBean listByPayment(@RequestParam("orgPath") String orgPath, @RequestParam("key") String key);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java

@@ -89,4 +89,9 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig
 	public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
 		return null;
 	}
+
+	@Override
+	public ResultBean listByPayment(String orgPath, String key) {
+		return null;
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java

@@ -31,10 +31,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
-import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
+import com.yxt.anrui.fin.api.finmanufacturerbank.*;
-import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo;
-import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo;
-import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -66,7 +63,9 @@ public interface FinManufacturerBankMapper extends BaseMapper<FinManufacturerBan
 
     List<FinManufacturerVo> selectAccountByUseOrgSid(String useOrgSid);
 
-    List<FinManufacturerVo> selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param(Constants.WRAPPER) QueryWrapper<FinManufacturerBank> qw);
+    List<FinManufacturerVo> selAccountByOrgSid(@Param("useOrgSid") String useOrgSid, @Param("name") String name, @Param(Constants.WRAPPER) QueryWrapper<FinManufacturerBank> qw);
 
-    IPage<FinManufacturerVo> selAppAccountByOrgSid(IPage<FinManufacturerVo> page,@Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw,@Param("name") String name);
+    IPage<FinManufacturerVo> selAppAccountByOrgSid(IPage<FinManufacturerVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw, @Param("name") String name);
+
+    List<BankVoForPayment> listByPayment(@Param("useOrgSid") String useOrgSid, @Param("key") String key);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml

@@ -87,4 +87,10 @@
             </if>
         </where>
     </select>
+    <select id="listByPayment" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.BankVoForPayment">
+        select bankAccount as accountNumber, accountName as account, depositBank
+        from fin_manufacturer_bank
+        where useOrgSid = #{useOrgSid}
+          and dueBankKey = #{key}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java

@@ -105,4 +105,9 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign {
         IPage<FinManufacturerVo> voIPage = finManufacturerBankService.selAppAccountByOrgSid(query);
         return rb.success().setData(voIPage);
     }
+
+    @Override
+    public ResultBean listByPayment(String orgPath, String key) {
+        return finManufacturerBankService.listByPayment(orgPath,key);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@@ -80,10 +80,10 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         QueryWrapper<FinManufacturerBank> qw = new QueryWrapper<>();
         FinManufacturerBankQuery params = pq.getParams();
         if (params != null) {
-            if(StringUtils.isNotBlank(params.getOrgPath())){
+            if (StringUtils.isNotBlank(params.getOrgPath())) {
                 String orgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData();
                 qw.eq("useOrgSid", orgSid);
-            }else{
+            } else {
                 String userSid = params.getUserSid();
                 if (StringUtils.isNotBlank(userSid)) {
                     ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
@@ -126,7 +126,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             }
             baseMapper.insert(finManufacturerBank);
             List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
-            if (data != null){
+            if (data != null) {
                 for (BasePurchaseSystemDetailsVo datum : data) {
                     CNBankacnt cnBankacnt = new CNBankacnt();
                     cnBankacnt.setFCreateOrgId(datum.getOrgCode());
@@ -136,7 +136,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
                     cnBankacnt.setFName(finManufacturerBank.getAccountName());
                     cnBankcntService.draftCNBankcnt(cnBankacnt);
                 }
-            }else {
+            } else {
                 CNBankacnt cnBankacnt = new CNBankacnt();
                 String useOrgSid = finManufacturerBank.getUseOrgSid();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -161,7 +161,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             finManufacturerBank.setBankAccount(StringUtils.deleteWhitespace(dto.getBankAccount()));
             baseMapper.updateById(finManufacturerBank);
             List<BasePurchaseSystemDetailsVo> data = basePurchaseSystemFeign.fetchOrgCodeByUseOrgSid(finManufacturerBank.getUseOrgSid()).getData();
-            if (data != null){
+            if (data != null) {
                 for (BasePurchaseSystemDetailsVo datum : data) {
                     CNBankacnt cnBankacnt = new CNBankacnt();
                     cnBankacnt.setFCreateOrgId(datum.getOrgCode());
@@ -171,7 +171,7 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
                     cnBankacnt.setFName(finManufacturerBank.getAccountName());
                     cnBankcntService.updateCNBankacnt(cnBankacnt);
                 }
-            }else {
+            } else {
                 CNBankacnt cnBankacnt = new CNBankacnt();
                 String useOrgSid = finManufacturerBank.getUseOrgSid();
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
@@ -196,12 +196,12 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         return rb.success().setData(vo);
     }
 
-    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid,String orgPath) {
+    public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid, String orgPath) {
         ResultBean<List<FinManufacturerVo>> rb = ResultBean.fireFail();
         String useOrgSid = "";
-        if(StringUtils.isNotBlank(orgPath)){
+        if (StringUtils.isNotBlank(orgPath)) {
             useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        }else{
+        } else {
             useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         }
         List<FinManufacturerVo> list = baseMapper.selectAccountByUseOrgSid(useOrgSid);
@@ -220,20 +220,20 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
         } else {
             useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
-        qw.eq("useOrgSid",useOrgSid);
+        qw.eq("useOrgSid", useOrgSid);
-        if(StringUtils.isNotBlank(query.getCollectionTypeKey())){
+        if (StringUtils.isNotBlank(query.getCollectionTypeKey())) {
             String key = "";
             //个人账户
-            if("03".equals(query.getCollectionTypeKey())){
+            if ("03".equals(query.getCollectionTypeKey())) {
                 key = "01";
-                qw.eq("dueBankKey",key);
+                qw.eq("dueBankKey", key);
             }
-            if("05".equals(query.getCollectionTypeKey())){
+            if ("05".equals(query.getCollectionTypeKey())) {
                 key = "02";
-                qw.eq("dueBankKey",key);
+                qw.eq("dueBankKey", key);
             }
         }
-        List<FinManufacturerVo> list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName(),qw);
+        List<FinManufacturerVo> list = baseMapper.selAccountByOrgSid(useOrgSid, query.getName(), qw);
         list.removeAll(Collections.singleton(null));
         return rb.success().setData(list);
     }
@@ -250,19 +250,26 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
             orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getParams().getUserSid()).getData();
         }
         qw.eq("useOrgSid", orgSid);
-        if(StringUtils.isNotBlank(query.getParams().getCollectionTypeKey())){
+        if (StringUtils.isNotBlank(query.getParams().getCollectionTypeKey())) {
             String key = "";
             //个人账户
-            if("03".equals(query.getParams().getCollectionTypeKey())){
+            if ("03".equals(query.getParams().getCollectionTypeKey())) {
                 key = "01";
-                qw.eq("dueBankKey",key);
+                qw.eq("dueBankKey", key);
             }
-            if("05".equals(query.getParams().getCollectionTypeKey())){
+            if ("05".equals(query.getParams().getCollectionTypeKey())) {
                 key = "02";
-                qw.eq("dueBankKey",key);
+                qw.eq("dueBankKey", key);
             }
         }
         IPage<FinManufacturerVo> iPage = baseMapper.selAppAccountByOrgSid(page, qw, name);
         return iPage;
     }
+
+    public ResultBean listByPayment(String orgPath, String key) {
+        ResultBean rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+        List<BankVoForPayment> list = baseMapper.listByPayment(useOrgSid, key);
+        return rb.success().setData(list);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@@ -94,6 +94,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
             LoanTransferPaymentRecordVo recordVo = baseMapper.paymentInfo(sid);
             recordVo.setSpread("0");
             recordVo.setDefaultInterest("0");
+            if (StringUtils.isNotBlank(recordVo.getActualMoney())) {
+                recordVo.setTransferPrincipal(recordVo.getActualMoney());
+            }
             if (StringUtils.isNotBlank(recordVo.getBankContractNo())) {
                 LoanTransferPaymentRecord paymentRecord = loanTransferPaymentRecordService.selByBankContractNo(recordVo.getBankContractNo());
                 if (null != paymentRecord) {