招行支付2.0—账户逻辑优化,采用服务商名称匹配账户信息

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayaccount/service/IHlwPayAccountCmbService.java

@@ -3,14 +3,15 @@ package org.jeecg.modules.hlwpayaccount.service;
 import com.alibaba.fastjson.JSONObject;
 import org.jeecg.modules.hlwpayaccount.entity.HlwPayAccountCmb;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractor;
 
 /**
  * @Description: hlw_pay_account_cmb
  * @Author: jeecg-boot
- * @Date:   2021-06-04
+ * @Date: 2021-06-04
  * @Version: V1.0
  */
 public interface IHlwPayAccountCmbService extends IService<HlwPayAccountCmb> {
 
-    HlwPayAccountCmb saveAccout(JSONObject jsonObject, Integer subcontractorId);
+    HlwPayAccountCmb saveAccout(JSONObject jsonObject, HlwSubcontractor hlwSubcontractor);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlwpayaccount/service/impl/HlwPayAccountCmbServiceImpl.java

@@ -7,6 +7,7 @@ import org.jeecg.modules.hlwpayaccount.entity.HlwPayAccount;
 import org.jeecg.modules.hlwpayaccount.entity.HlwPayAccountCmb;
 import org.jeecg.modules.hlwpayaccount.mapper.HlwPayAccountCmbMapper;
 import org.jeecg.modules.hlwpayaccount.service.IHlwPayAccountCmbService;
+import org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractor;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -25,22 +26,27 @@ import java.util.List;
 public class HlwPayAccountCmbServiceImpl extends ServiceImpl<HlwPayAccountCmbMapper, HlwPayAccountCmb> implements IHlwPayAccountCmbService {
 
     @Override
-    public HlwPayAccountCmb saveAccout(JSONObject jsonObject, Integer subcontractorId) {
+    public HlwPayAccountCmb saveAccout(JSONObject jsonObject, HlwSubcontractor hlwSubcontractor) {
         HlwPayAccountCmb hlwPayAccountCmb = new HlwPayAccountCmb();
         hlwPayAccountCmb.setAccnbr(jsonObject.getString("accnbr"));
-        hlwPayAccountCmb.setSubcontractorId(subcontractorId);
+        hlwPayAccountCmb.setSubcontractorId(hlwSubcontractor.getId());
         //查询当前账号是否存在
         List<HlwPayAccountCmb> hlwPayAccountCmbList = baseMapper.getCount(hlwPayAccountCmb);
         if (hlwPayAccountCmbList.size() > 0) {
             hlwPayAccountCmb = hlwPayAccountCmbList.get(0);
         } else {
-            hlwPayAccountCmb.setSubcontractorId(subcontractorId);
-            hlwPayAccountCmb.setAccnbr(jsonObject.getString("accnbr"));
-            hlwPayAccountCmb.setAccnam(jsonObject.getString("accnam"));
-            hlwPayAccountCmb.setBbknbr(jsonObject.getString("bbknbr"));
-            hlwPayAccountCmb.setCcynbr(jsonObject.getString("ccynbr"));
-            hlwPayAccountCmb.setDelFlag("0");
-            this.save(hlwPayAccountCmb);
+            //通过服务商名称匹配
+            if (hlwSubcontractor.getName().equals(jsonObject.getString("accnam"))) {
+                hlwPayAccountCmb.setSubcontractorId(hlwSubcontractor.getId());
+                hlwPayAccountCmb.setAccnbr(jsonObject.getString("accnbr"));
+                hlwPayAccountCmb.setAccnam(jsonObject.getString("accnam"));
+                hlwPayAccountCmb.setBbknbr(jsonObject.getString("bbknbr"));
+                hlwPayAccountCmb.setCcynbr(jsonObject.getString("ccynbr"));
+                hlwPayAccountCmb.setDelFlag("0");
+                this.save(hlwPayAccountCmb);
+            } else {
+                return null;
+            }
         }
         return hlwPayAccountCmb;
     }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/utils/PayRsaCommon.java

@@ -76,8 +76,10 @@ public class PayRsaCommon {
                             JSONObject jsonObject2 = jsonArray.getJSONObject(i);
                             log.info("账号========{}", jsonObject2.get("accnbr"));
                             log.info("户名========{}", jsonObject2.get("accnam"));
-                            HlwPayAccountCmb hlwPayAccountCmb = iHlwPayAccountCmbService.saveAccout(jsonObject2, hlwSubcontractor.getId());
-                            hlwPayAccountCmbList.add(hlwPayAccountCmb);
+                            HlwPayAccountCmb hlwPayAccountCmb = iHlwPayAccountCmbService.saveAccout(jsonObject2, hlwSubcontractor);
+                            if (hlwPayAccountCmb != null) {
+                                hlwPayAccountCmbList.add(hlwPayAccountCmb);
+                            }
                         }
                     }
                     log.info("head========{}", jsonObjectHead.getString("resultcode"));
@@ -89,7 +91,7 @@ public class PayRsaCommon {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            log.info("请求报错{}" , e.getMessage());
+            log.info("请求报错{}", e.getMessage());
         }
         return hlwPayAccountCmbList;
     }