支付组件

mec-application/src/main/java/com/ym/mec/web/controller/payment/AdapayController.java

@@ -213,7 +213,7 @@ public class AdapayController extends BaseController {
         long createdLte = DateUtil.getLastSecondWithDay(endTime).getTime();
         int pageIndex = 1;
         List<Map<String, Object>> data = new ArrayList<>();
-        while (profiles.equals("prod")) {
+        while (profiles.equals("prod") || profiles.equals("pre")) {
         	HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.ADAPAY.getCode());
             if(hfMerchantConfig == null){
             	throw new BizException("机构[{}]汇付商户信息找不到", TenantContextHolder.getTenantId());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -612,7 +612,7 @@ public class ExportServiceImpl implements ExportService {
         long createdLte = DateUtil.getLastSecondWithDay(endTime).getTime();
         int pageIndex = 1;
         List<Map<String, Object>> data = new ArrayList<>();
-        while ("prod".equals(profiles)) {
+        while ("prod".equals(profiles) || "pre".equals(profiles)) {
             Map<String, Object> paymentList = null;
             HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.ADAPAY.getCode());
             if (hfMerchantConfig == null) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/HfMemberServiceImpl.java

@@ -97,7 +97,8 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if (paymentService == null) {
             throw new BizException("支付渠道不存在:{}", member.getPayerName());
         }
-        PaymentMerchant.MerchantMember merchantMember = getMerchantMember(member);
+        PaymentMerchant.MerchantMember merchantMember = getHfMerchantMember(member);
+        merchantMember.setAttachFile(file);
         try {
             log.info("创建子账户参数:{}", JSON.toJSONString(merchantConfig));
             Map<String, Object> paymentCorpMember = paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
@@ -135,11 +136,10 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         return true;
     }
 
-    private PaymentMerchant.MerchantMember getMerchantMember(HfMember tenantMember) {
+    private PaymentMerchant.MerchantMember getHfMerchantMember(HfMember tenantMember) {
         PaymentMerchant.MerchantMember merchantMember = PaymentMerchant.MerchantMember.builder()
                 .memberId(tenantMember.getMemberId())
                 .merchantName(tenantMember.getName())
-                .merchantType(tenantMember.getMerchantType())
                 .provinceCode(tenantMember.getProvCode())
                 .cityCode(tenantMember.getAreaCode())
                 .districtCode(tenantMember.getDistrictCode())
@@ -151,10 +151,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
                 .legalCertIdExpires(tenantMember.getLegalCertIdExpires())
                 .mobile(tenantMember.getLegalMp())
                 .legalLicenceType(tenantMember.getLegalLicenceType())
-                .legalLicenceFrontUrl(tenantMember.getLegalLicenceFrontUrl())
-                .legalLicenceBackUrl(tenantMember.getLegalLicenceBackUrl())
                 .address(tenantMember.getAddress())
-                .attachFile(tenantMember.getFile())
                 .bankCode(tenantMember.getBankCode())
                 .bankAccountType(tenantMember.getBankAcctType())
                 .bankCardNo(tenantMember.getCardNo())
@@ -162,8 +159,6 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
                 .zipCode(tenantMember.getZipCode())
                 .requestNo(tenantMember.getRequestNo())
                 .licenceNo(tenantMember.getSocialCreditCode())
-                .licenceUrl(tenantMember.getLicenceUrl())
-                .openAccountLicenceUrl(tenantMember.getOpenAccountLicenceUrl())
                 .contactName(tenantMember.getContactName())
                 .contactMobile(tenantMember.getContactMobile())
                 .contactEmail(tenantMember.getContactEmail())
@@ -172,12 +167,10 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
                 .secondaryIndustryCategory("120004")
                 .settlementDirection("BANKCARD")
                 .build();
-        if (tenantMember.getPayerType().equals(EPayerType.ADAPAY)) {
-            merchantMember.setNotifyUrl(sysConfigService.findConfigValue(SysConfigConstant.SUB_ACCOUNT_CREATE_CALLBACK_URL) +
-                    "/" + EPayerType.ADAPAY.getDesc());
-        } else if (tenantMember.getPayerType().equals(EPayerType.YEEPAY)) {
-            merchantMember.setNotifyUrl(sysConfigService.findConfigValue(SysConfigConstant.SUB_ACCOUNT_CREATE_CALLBACK_URL )+
-                    "/" + EPayerType.YEEPAY.getDesc());
+        if (StringUtils.equals(env, "prod") || StringUtils.equals(env, "pre")) {
+            merchantMember.setNotifyUrl(MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_prod, "adapay"));
+        } else {
+            merchantMember.setNotifyUrl(MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_test, "adapay"));
         }
         return merchantMember;
 
@@ -214,7 +207,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         enterpriseUser.setMemberId(member.getMemberId());
         enterpriseUser.setName(member.getName());
         
-        if(StringUtils.equals(env, "prod")){
+        if(StringUtils.equals(env, "prod") || StringUtils.equals(env, "pre")){
             enterpriseUser.setNotifyUrl(AdapayNotifyConstants.corp_member_notify_url_prod);
         }else {
             enterpriseUser.setNotifyUrl(AdapayNotifyConstants.corp_member_notify_url_test);
@@ -304,7 +297,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
 		enterpriseUser.setMemberId(member.getMemberId());
 		enterpriseUser.setName(member.getName());
 
-		if (StringUtils.equals(env, "prod")) {
+		if (StringUtils.equals(env, "prod") || StringUtils.equals(env, "pre")) {
 			enterpriseUser.setNotifyUrl(MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_prod, "adapay"));
 		} else {
 			enterpriseUser.setNotifyUrl(MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_test, "adapay"));
@@ -349,7 +342,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
 		merchantInfo.setSettlementDirection("BANKCARD");
 
 		String notifyURL = MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_test, "yeepay");
-		if (StringUtils.equals(env, "prod")) {
+		if (StringUtils.equals(env, "prod") || StringUtils.equals(env, "pre")) {
 			notifyURL = MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_prod, "yeepay");
 		}
 		

mec-thirdparty/pom.xml

@@ -95,7 +95,7 @@
 				${project.basedir}/libs/SADK-3.2.5.2.jar</systemPath>
 		</dependency>
 
-		<!--<dependency>
+		<dependency>
 			<groupId>com.yeepay.yop</groupId>
 			<artifactId>yop-java-sdk</artifactId>
 			<version>3.2.25-jdk18json</version>
@@ -111,14 +111,14 @@
 			<version>
 				1.2.10</version>
 		</dependency>
-	
-		&lt;!&ndash; https://mvnrepository.com/artifact/com.huifu.adapay/adapay-java-sdk &ndash;&gt;
+
+		<!-- https://mvnrepository.com/artifact/com.huifu.adapay/adapay-java-sdk -->
 		<dependency>
 			<groupId>com.huifu.adapay</groupId>
 			<artifactId>
 				adapay-java-sdk</artifactId>
 			<version>1.2.10</version>
-		</dependency>-->
+		</dependency>
 		
 		<dependency>
 		    <groupId>