fix

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantMemberServiceImpl.java

@@ -91,7 +91,7 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
             HashSet<Integer> areaCodes = new HashSet<>();
             areaCodes.add(Integer.valueOf(next.getProvCode()));
             areaCodes.add(Integer.valueOf(next.getAreaCode()));
-            areaCodes.add(Integer.valueOf(next.getDistrictCode()));
+            areaCodes.add(next.getDistrictCode()!= null?Integer.valueOf(next.getDistrictCode()):null);
             return areaCodes;
         }).flatMap(Collection::stream).filter(Objects::nonNull).distinct().collect(Collectors.toList());
         if (!areaCodeList.isEmpty()) {
@@ -127,6 +127,7 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
 
         PaymentMerchant.MerchantMember merchantMember = getMerchantMember(tenantMember);
         try {
+            log.info("创建子账户参数:{}", JSON.toJSONString(merchantConfig));
             Map<String, Object> paymentCorpMember = paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
         }catch (Exception e) {
             log.error("创建子账户失败", e);
@@ -176,11 +177,11 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
                 .settlementDirection("BANKCARD")
                 .build();
         if (tenantMember.getPayerType().equals(EPayerType.ADAPAY)) {
-            merchantMember.setNotifyUrl(sysConfigService.findConfigValue(SysConfigConstant.SUB_ACCOUNT_CREATE_CALLBACK_URL +
-                    "/" + EPayerType.ADAPAY.getCode()));
+            merchantMember.setNotifyUrl(sysConfigService.findConfigValue(SysConfigConstant.SUB_ACCOUNT_CREATE_CALLBACK_URL) +
+                    "/" + EPayerType.ADAPAY.getCode());
         } else if (tenantMember.getPayerType().equals(EPayerType.YEEPAY)) {
-            merchantMember.setNotifyUrl(sysConfigService.findConfigValue(SysConfigConstant.SUB_ACCOUNT_CREATE_CALLBACK_URL +
-                    "/" + EPayerType.YEEPAY.getCode()+"/"+tenantMember.getRequestNo()));
+            merchantMember.setNotifyUrl(sysConfigService.findConfigValue(SysConfigConstant.SUB_ACCOUNT_CREATE_CALLBACK_URL )+
+                    "/" + EPayerType.YEEPAY.getCode()+"/"+tenantMember.getRequestNo());
         }
         return merchantMember;