支付组件

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.AdapayCore;
 import com.huifu.adapay.core.util.AdapaySign;
+import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
+import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentMerchant;
 import com.ym.mec.biz.dal.entity.HfMember;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
 import com.ym.mec.biz.dal.page.HfMemberQueryInfo;
@@ -16,7 +18,6 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
-import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.adapay.entity.AccountInfo;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 import com.ym.mec.util.date.DateUtil;
@@ -26,7 +27,6 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -48,11 +49,12 @@ import java.util.Map;
 @RestController
 public class AdapayController extends BaseController {
 
-    @Autowired
+    @Resource
     private HfMemberService hfMemberService;
-    
-    @Autowired
+    @Resource
     private HfMerchantConfigService hfMerchantConfigService;
+    @Resource
+    private PaymentServiceContext paymentServiceContext;
 
     @Value("${spring.profiles.active:dev}")
     private String profiles;
@@ -218,7 +220,8 @@ public class AdapayController extends BaseController {
             if(hfMerchantConfig == null){
             	throw new BizException("机构[{}]汇付商户信息找不到", TenantContextHolder.getTenantId());
             }
-            Map<String, Object> paymentList = Payment.queryList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), pageIndex, createdGte, createdLte);
+            Map<String, Object> paymentList = hfMemberService.queryWithKey(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), pageIndex, createdGte, createdLte);
+//            Map<String, Object> paymentList = Payment.queryList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), pageIndex, createdGte, createdLte);
             JSONArray payments = (JSONArray) paymentList.get("payments");
             if (!paymentList.get("status").equals("succeeded")) {
                 throw new BizException("查询失败，请重试");
@@ -248,7 +251,7 @@ public class AdapayController extends BaseController {
                     }
                     if (paymentMap.get("pay_mode").equals("delay")) {
                         if (!paymentMap.containsKey("payment_confirms")) {
-                            Map<String, Object> confirmMap = Payment.queryConfirmList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), paymentMap.get("id").toString());
+                            Map<String, Object> confirmMap = hfMemberService.queryConfirmList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), paymentMap.get("id").toString());
                             if (confirmMap.containsKey("payment_confirms")) {
                                 paymentMap.put("payment_confirms", confirmMap.get("payment_confirms"));
                             }

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

@@ -2,6 +2,9 @@ package com.ym.mec.web.controller.payment;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentService;
+import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
+import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentMerchant;
 import com.yeepay.g3.sdk.yop.encrypt.DigitalEnvelopeDTO;
 import com.yeepay.g3.sdk.yop.utils.DigitalEnvelopeUtils;
 import com.yeepay.g3.sdk.yop.utils.RSAKeyUtils;
@@ -17,7 +20,6 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import com.ym.mec.thirdparty.yeepay.YeepayMerchantService;
 import com.ym.mec.thirdparty.yeepay.YeepayUploadService;
 import com.ym.mec.thirdparty.yeepay.entity.MerchantInfo;
 import io.swagger.annotations.Api;
@@ -26,12 +28,11 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -47,20 +48,19 @@ import java.util.Date;
 public class YeepayController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(YeepayController.class);
 
-    @Autowired
+    @Resource
     private HfMemberService hfMemberService;
     
-    @Autowired
+    @Resource
     private HfMerchantConfigService hfMerchantConfigService;
     
-    @Autowired
+    @Resource
     private YeepayUploadService yeepayUploadService;
-    
-    @Autowired
-    private YeepayMerchantService yeepayMerchantService;
+    @Resource
+    private PaymentServiceContext paymentServiceContext;
 
-    @Value("${spring.profiles.active:dev}")
-    private String profiles;
+//    @Value("${spring.profiles.active:dev}")
+//    private String profiles;
 
     @ApiOperation(value = "企业用户列表")
     @GetMapping("/queryPage")
@@ -74,14 +74,16 @@ public class YeepayController extends BaseController {
     @ApiOperation(value = "企业用户注册查询")
     @GetMapping("/registerQuery")
     @PreAuthorize("@pcs.hasPermissions('yeepay/registerQuery')")
-    public HttpResponseResult<JSONObject> registerQuery(String requestNo) throws IOException {
-		
-		HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
-        if(hfMerchantConfig == null){
-        	throw new BizException("机构[{}][{}]商户信息找不到", TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
+    public HttpResponseResult<PaymentMerchant.MerchantMember> registerQuery(String requestNo) throws IOException {
+        BasePaymentService paymentService = paymentServiceContext.getPaymentService(PaymentChannelEnum.YEEPAY.getCode() + "_" + TenantContextHolder.getTenantId());
+        if(paymentService == null){
+        	throw new BizException("机构[{}][{}]支付服务找不到", TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
         }
-        
-        return succeed(yeepayMerchantService.registerQueryV2(hfMerchantConfig, requestNo));
+        PaymentMerchant.MerchantConfig merchantConfig = hfMemberService.getMerchantConfig(PaymentChannelEnum.YEEPAY.getCode(), TenantContextHolder.getTenantId());
+        PaymentMerchant.MerchantMember hfMerchantConfig = new PaymentMerchant.MerchantMember();
+        hfMerchantConfig.setRequestNo(requestNo);
+        return succeed(paymentService.getPaymentCorpMember(merchantConfig, hfMerchantConfig));
+//        return succeed(yeepayMerchantService.registerQueryV2(hfMerchantConfig, requestNo));
     }
 
     @ApiOperation("新建企业用户")
@@ -172,12 +174,19 @@ public class YeepayController extends BaseController {
             inputStream.close();
             fos.close();
             
-            HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
+            /*HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
             if(hfMerchantConfig == null){
             	throw new BizException("请配置机构的易宝商户信息");
+            }*/
+            BasePaymentService paymentService = paymentServiceContext.getPaymentService(PaymentChannelEnum.YEEPAY.getCode() + "_" + TenantContextHolder.getTenantId());
+            if(paymentService == null){
+            	throw new BizException("机构[{}][{}]支付服务找不到", TenantContextHolder.getTenantId(), PaymentChannelEnum.YEEPAY.getCode());
             }
-        	
-            return succeed(yeepayUploadService.upload(hfMerchantConfig, file));
+            PaymentMerchant.MerchantConfig merchantConfig = hfMemberService.getMerchantConfig(PaymentChannelEnum.YEEPAY.getCode(), TenantContextHolder.getTenantId());
+            String upload = paymentService.upload(merchantConfig, file);
+            return succeed(upload);
+
+//            return succeed(yeepayUploadService.upload(hfMerchantConfig, file));
         } catch (Exception e) {
             return failed(e.getMessage());
         } finally {

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -1,9 +1,6 @@
 package com.ym.mec.auth.web.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.dayaedu.cbs.openfeign.service.CbsQrCodeScanService;
-import com.dayaedu.cbs.openfeign.wrapper.qrcode.CbsQrCodeScanWrapper;
-import com.huifu.adapay.core.util.StringUtil;
 import com.ym.mec.auth.api.dto.SysUserInfo;
 import com.ym.mec.auth.api.dto.SysUserQueryInfo;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -28,14 +25,15 @@ import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
 import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.*;
+import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
@@ -45,24 +43,24 @@ import java.util.*;
 @Api(tags = "会员服务")
 public class UserController extends BaseController {
 
-	@Autowired
+	@Resource
 	private SysUserService sysUserService;
-	@Autowired
+	@Resource
 	private SysRoleService sysRoleService;
-	@Autowired
+	@Resource
 	private ImFeignService imFeignService;
-	@Autowired
+	@Resource
 	private SysUserRoleService sysUserRoleService;
-	@Autowired
+	@Resource
 	private IdGeneratorService smsCodeService;
-	@Autowired
+	@Resource
 	private TenantInfoService tenantInfoService;
-	@Autowired
+	@Resource
 	private RedisCache<String,Object> redisCache;
 
 	@Value("${message.debugMode}")
 	private boolean debugMode;
-	@Autowired
+	@Resource
 	private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
 
 	@ApiOperation(value = "分页查询用户信息")

mec-biz/src/main/java/com/ym/mec/biz/service/HfMemberService.java

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.service;
 
 import java.io.File;
+import java.util.Map;
 
+import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentMerchant;
 import com.ym.mec.biz.dal.entity.HfMember;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.thirdparty.adapay.entity.AccountInfo;
@@ -22,7 +24,13 @@ public interface HfMemberService extends BaseService<Integer, HfMember> {
 
     boolean createMember(HfMember member, File file) throws Exception;
 
+    PaymentMerchant.MerchantConfig getMerchantConfig(String paymentVerdor, Integer tenantId);
+
     boolean updateMember(HfMember member, File file) throws Exception;
 
     boolean mergeSettleAccount(String memberId, AccountInfo accountInfo) throws Exception;
+
+    Map<String, Object> queryWithKey(String appId, String merKey, int pageIndex, long createdGte, long createdLte);
+
+    Map<String, Object> queryConfirmList(String appId, String merchantKey, String paymentId);
 }

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

@@ -171,7 +171,7 @@ public class ExportServiceImpl implements ExportService {
     @Resource
     private StudentCourseConsumerService studentCourseConsumerService;
     @Resource
-    private StudentTeacherMapperDao studentTeacherMapperDao;
+    private HfMemberService hfMemberService;
     @Resource
     private TeacherCloudCourseReportService teacherCloudCourseReportService;
     @Resource
@@ -619,7 +619,7 @@ public class ExportServiceImpl implements ExportService {
                 throw new BizException("机构[{}]汇付商户信息找不到", TenantContextHolder.getTenantId());
             }
             try {
-                paymentList = Payment.queryList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), pageIndex, createdGte, createdLte);
+                paymentList = hfMemberService.queryWithKey(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), pageIndex, createdGte, createdLte);
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -654,7 +654,7 @@ public class ExportServiceImpl implements ExportService {
                         if (!paymentMap.containsKey("payment_confirms")) {
                             Map<String, Object> confirmMap = null;
                             try {
-                                confirmMap = Payment.queryConfirmList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), paymentMap.get("id").toString());
+                                confirmMap = hfMemberService.queryConfirmList(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), paymentMap.get("id").toString());
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }

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

@@ -1,20 +1,10 @@
 package com.ym.mec.biz.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSON;
+import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentService;
 import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
 import com.microsvc.toolkit.middleware.payment.common.api.entity.PaymentMerchant;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.ym.mec.biz.dal.config.AdapayNotifyConstants;
 import com.ym.mec.biz.dal.dao.HfMemberDao;
 import com.ym.mec.biz.dal.dto.YeepayMember;
@@ -25,35 +15,38 @@ import com.ym.mec.biz.service.HfMerchantConfigService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.adapay.CorpMemberService;
 import com.ym.mec.thirdparty.adapay.SettleAccountService;
 import com.ym.mec.thirdparty.adapay.entity.AccountInfo;
 import com.ym.mec.thirdparty.adapay.entity.EnterpriseUser;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import com.ym.mec.thirdparty.yeepay.YeepayMerchantService;
-import com.ym.mec.thirdparty.yeepay.entity.MerchantInfo;
+import com.ym.mec.thirdparty.exception.ThirdpartyException;
 import com.ym.mec.util.string.MessageFormatter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.io.File;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service
+@Slf4j
 public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> implements HfMemberService {
 	
-    @Autowired
+    @Resource
     private HfMemberDao hfMemberDao;
-    
-    @Autowired
+    @Resource
     private SettleAccountService settleAccountService;
-    
-    @Autowired
+    @Resource
     private CorpMemberService corpMemberService;
-    
-    @Autowired
+    @Resource
     private HfMerchantConfigService hfMerchantConfigService;
-    
-    @Autowired
-    private YeepayMerchantService yeepayMerchantService;
-
     @Resource
     private PaymentServiceContext paymentServiceContext;
 
@@ -97,20 +90,17 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if (paymentService == null) {
             throw new BizException("支付渠道不存在:{}", member.getPayerName());
         }
+        PaymentMerchant.MerchantConfig merchantConfig = getMerchantConfig(member.getPayerName() + "_" + member.getTenantId(),member.getTenantId());
         PaymentMerchant.MerchantMember merchantMember = getHfMerchantMember(member);
         merchantMember.setAttachFile(file);
         try {
-            log.info("创建子账户参数:{}", JSON.toJSONString(merchantConfig));
-            Map<String, Object> paymentCorpMember = paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
-            if (tenantMember.getPayerType().equals(EPayerType.YEEPAY)) {
-                tenantMember.setMemberId(paymentCorpMember.get("merchantNo").toString());
-//                tenantMember.setRequestNo(paymentCorpMember.get("requestNo").toString());
-            }
+            log.info("创建子账户参数:{}", JSON.toJSONString(merchantMember));
+            paymentService.createPaymentCorpMember(merchantConfig, merchantMember);
         }catch (Exception e) {
             log.error("创建子账户失败", e);
             throw new BizException("创建子账户失败:" + e.getMessage());
         }
-
+/*
         switch (PaymentChannelEnum.codeOf(member.getPayerName())) {
 		case ADAPAY:
 			createMemberWithAdapay(member, file);
@@ -125,7 +115,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
 		default:
 			
 			return false;
-		}
+		}*/
 
         Date nowDate = new Date();
         member.setCreateTime(nowDate);
@@ -136,44 +126,109 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         return true;
     }
 
-    private PaymentMerchant.MerchantMember getHfMerchantMember(HfMember tenantMember) {
-        PaymentMerchant.MerchantMember merchantMember = PaymentMerchant.MerchantMember.builder()
-                .memberId(tenantMember.getMemberId())
-                .merchantName(tenantMember.getName())
-                .provinceCode(tenantMember.getProvCode())
-                .cityCode(tenantMember.getAreaCode())
-                .districtCode(tenantMember.getDistrictCode())
-                .socialCreditCode(tenantMember.getSocialCreditCode())
-                .socialCreditCodeExpires(tenantMember.getSocialCreditCodeExpires())
-                .businessScope(tenantMember.getBusinessScope())
-                .legalName(tenantMember.getLegalPerson())
-                .legalLicenceNo(tenantMember.getLegalCertId())
-                .legalCertIdExpires(tenantMember.getLegalCertIdExpires())
-                .mobile(tenantMember.getLegalMp())
-                .legalLicenceType(tenantMember.getLegalLicenceType())
-                .address(tenantMember.getAddress())
-                .bankCode(tenantMember.getBankCode())
-                .bankAccountType(tenantMember.getBankAcctType())
-                .bankCardNo(tenantMember.getCardNo())
-                .cardName(tenantMember.getCardName())
-                .zipCode(tenantMember.getZipCode())
-                .requestNo(tenantMember.getRequestNo())
-                .licenceNo(tenantMember.getSocialCreditCode())
-                .contactName(tenantMember.getContactName())
-                .contactMobile(tenantMember.getContactMobile())
-                .contactEmail(tenantMember.getContactEmail())
-                .contactLicenceNo(tenantMember.getContactLicenceNo())
-                .primaryIndustryCategory("120")
-                .secondaryIndustryCategory("120004")
-                .settlementDirection("BANKCARD")
+    @Override
+    public PaymentMerchant.MerchantConfig getMerchantConfig(String paymentVerdor, Integer tenantId) {
+        HfMerchantConfig merchantConfig = hfMerchantConfigService.queryByTenantId(tenantId,paymentVerdor);
+        if (merchantConfig == null) {
+            throw new BizException("机构[{}]商户信息找不到", tenantId);
+        }
+        return PaymentMerchant.MerchantConfig.builder()
+                .payerName(paymentVerdor)
+                .appId(merchantConfig.getAppId())
+                .merchantKey(merchantConfig.getMerKey())
+                .apiKey(merchantConfig.getApiKey())
+                .rsaPrivateKey(merchantConfig.getRsaPrivateKey())
+                .rsaPublicKey(merchantConfig.getRsaPublicKey())
+                .wxAppId(merchantConfig.getWxAppId())
+                .wxAppSecret(merchantConfig.getWxAppSecret())
+                .alipayAppId(merchantConfig.getAlipayAppId())
+                .alipayPublicKey(merchantConfig.getAlipayPublicKey())
+                .platformPayeeMemberId(merchantConfig.getPlatformPayeeMemberId())
                 .build();
-        if (StringUtils.equals(env, "prod") || StringUtils.equals(env, "pre")) {
-            merchantMember.setNotifyUrl(MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_prod, "adapay"));
+    }
+
+    private PaymentMerchant.MerchantMember getHfMerchantMember(HfMember tenantMember) {
+        if (StringUtils.equalsIgnoreCase(tenantMember.getPayerName(), PaymentChannelEnum.ADAPAY.getCode())) {
+            PaymentMerchant.MerchantMember merchantMember = PaymentMerchant.MerchantMember.builder()
+                    .memberId(tenantMember.getMemberId())
+                    .merchantName(tenantMember.getName())
+                    .provinceCode(tenantMember.getProvCode())
+                    .cityCode(tenantMember.getAreaCode())
+                    .districtCode(tenantMember.getDistrictCode())
+                    .socialCreditCode(tenantMember.getSocialCreditCode())
+                    .socialCreditCodeExpires(tenantMember.getSocialCreditCodeExpires())
+                    .businessScope(tenantMember.getBusinessScope())
+                    .legalName(tenantMember.getLegalPerson())
+                    .legalLicenceNo(tenantMember.getLegalCertId())
+                    .legalCertIdExpires(tenantMember.getLegalCertIdExpires())
+                    .mobile(tenantMember.getLegalMp())
+                    .legalLicenceType(tenantMember.getLegalLicenceType())
+                    .address(tenantMember.getAddress())
+                    .bankCode(tenantMember.getBankCode())
+                    .bankAccountType(tenantMember.getBankAcctType())
+                    .bankCardNo(tenantMember.getCardNo())
+                    .cardName(tenantMember.getCardName())
+                    .zipCode(tenantMember.getZipCode())
+                    .requestNo(tenantMember.getRequestNo())
+                    .licenceNo(tenantMember.getSocialCreditCode())
+                    .contactName(tenantMember.getContactName())
+                    .contactMobile(tenantMember.getContactMobile())
+                    .contactEmail(tenantMember.getContactEmail())
+                    .contactLicenceNo(tenantMember.getContactLicenceNo())
+                    .primaryIndustryCategory("120")
+                    .secondaryIndustryCategory("120004")
+                    .settlementDirection("BANKCARD")
+                    .build();
+            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;
         } else {
-            merchantMember.setNotifyUrl(MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_test, "adapay"));
+            YeepayMember yeepayMember = (YeepayMember) tenantMember;
+            PaymentMerchant.MerchantMember merchantMember = PaymentMerchant.MerchantMember.builder()
+                    .memberId(yeepayMember.getMemberId())
+                    .merchantName(yeepayMember.getName())
+                    .merchantType(yeepayMember.getMerchantType())
+                    .provinceCode(yeepayMember.getProvCode())
+                    .cityCode(yeepayMember.getAreaCode())
+                    .districtCode(yeepayMember.getDistrictCode())
+                    .socialCreditCode(yeepayMember.getSocialCreditCode())
+                    .socialCreditCodeExpires(yeepayMember.getSocialCreditCodeExpires())
+                    .businessScope(yeepayMember.getBusinessScope())
+                    .legalName(yeepayMember.getLegalPerson())
+                    .legalLicenceNo(yeepayMember.getLegalCertId())
+                    .legalCertIdExpires(yeepayMember.getLegalCertIdExpires())
+                    .mobile(yeepayMember.getLegalMp())
+                    .legalLicenceType(yeepayMember.getLegalLicenceType())
+                    .legalLicenceFrontUrl(yeepayMember.getLegalLicenceFrontUrl())
+                    .legalLicenceBackUrl(yeepayMember.getLegalLicenceBackUrl())
+                    .address(yeepayMember.getAddress())
+                    .bankCode(yeepayMember.getBankCode())
+                    .bankAccountType(yeepayMember.getBankAcctType())
+                    .bankCardNo(yeepayMember.getCardNo())
+                    .cardName(yeepayMember.getCardName())
+                    .zipCode(yeepayMember.getZipCode())
+                    .requestNo(yeepayMember.getRequestNo())
+                    .licenceNo(yeepayMember.getSocialCreditCode())
+                    .licenceUrl(yeepayMember.getLicenceUrl())
+                    .openAccountLicenceUrl(yeepayMember.getOpenAccountLicenceUrl())
+                    .contactName(yeepayMember.getContactName())
+                    .contactMobile(yeepayMember.getContactMobile())
+                    .contactEmail(yeepayMember.getContactEmail())
+                    .contactLicenceNo(yeepayMember.getContactLicenceNo())
+                    .primaryIndustryCategory("120")
+                    .secondaryIndustryCategory("120004")
+                    .settlementDirection("BANKCARD")
+                    .build();
+            String notifyURL = MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_test, "yeepay");
+            if (StringUtils.equals(env, "prod") || StringUtils.equals(env, "pre")) {
+                notifyURL = MessageFormatter.arrayFormat(AdapayNotifyConstants.corp_member_notify_url_prod, "yeepay");
+            }
+            merchantMember.setNotifyUrl(notifyURL);
+            return merchantMember;
         }
-        return merchantMember;
-
     }
 
     @Override
@@ -183,8 +238,22 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if (hfMember == null) {
             throw new BizException("商户不存在请核对");
         }
+        BasePaymentService paymentService = paymentServiceContext.getPaymentService(member.getPayerName() + "_" + member.getTenantId());
+        if (paymentService == null) {
+            throw new BizException("支付渠道不存在:{}", member.getPayerName());
+        }
+        PaymentMerchant.MerchantConfig merchantConfig = getMerchantConfig(member.getPayerName() + "_" + member.getTenantId(),member.getTenantId());
+        PaymentMerchant.MerchantMember merchantMember = getHfMerchantMember(member);
+        merchantMember.setAttachFile(file);
+        try {
+            log.info("更新商户信息失败:{}", JSON.toJSONString(merchantMember));
+            paymentService.updatePaymentCorpMember(merchantConfig, merchantMember);
+        }catch (Exception e) {
+            log.error("更新商户信息失败", e);
+            throw new BizException("更新商户信息失败:" + e.getMessage());
+        }
+        /*Integer tenantId = member.getTenantId();
 
-        Integer tenantId = member.getTenantId();
         
         HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(tenantId, member.getPayerName());
         if(hfMerchantConfig == null){
@@ -218,7 +287,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         enterpriseUser.setSocialCreditCodeExpires(member.getSocialCreditCodeExpires());
         
         corpMemberService.update(hfMerchantConfig.getMerKey(), hfMerchantConfig.getAppId(), enterpriseUser, enterpriseUser.getNotifyUrl());
-
+*/
         Date nowDate = new Date();
         member.setUpdateTime(nowDate);
         member.setStatus("pending");
@@ -236,11 +305,6 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if (!hfMember.getStatus().equals("succeeded")) {
             throw new BizException("商户审核通过，才能绑定结算卡");
         }
-        /*hfMember.setCardNo(accountInfo.getCardId());
-        hfMember.setBankCode(accountInfo.getBankCode());
-        hfMember.setBankAcctType(accountInfo.getBankAcctType());
-        hfMember.setCardName(accountInfo.getCardName());*/
-        
         accountInfo.setAreaCode(hfMember.getAreaCode());
         accountInfo.setBankAcctType(hfMember.getBankAcctType());
         accountInfo.setBankCode(hfMember.getBankCode());
@@ -257,22 +321,87 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if(hfMerchantConfig == null){
         	throw new BizException("机构[{}]汇付商户信息找不到", tenantId);
         }
+        BasePaymentService paymentService = paymentServiceContext.getPaymentService(PaymentChannelEnum.ADAPAY.getCode() + "_" + TenantContextHolder.getTenantId());
+        if (paymentService == null) {
+            throw new BizException("支付渠道不存在:{}", PaymentChannelEnum.ADAPAY.getCode() + "_" + TenantContextHolder.getTenantId());
+        }
 
         //删除结算账户
         if (StringUtils.isNotBlank(hfMember.getSettleAccountId())) {
-            settleAccountService.delete(hfMerchantConfig.getMerKey(), hfMerchantConfig.getAppId(), memberId, hfMember.getSettleAccountId());
+//            settleAccountService.delete(hfMerchantConfig.getMerKey(), hfMerchantConfig.getAppId(), memberId, hfMember.getSettleAccountId());
+            paymentService.deleteSettleAccount(hfMerchantConfig.getMerKey(), hfMerchantConfig.getAppId(), memberId, hfMember.getSettleAccountId());
         }
 
         //创建结算账户
-        String settleAccountId = settleAccountService.create(hfMerchantConfig.getMerKey(), hfMerchantConfig.getAppId(), accountInfo);
+//        String settleAccountId = settleAccountService.create(hfMerchantConfig.getMerKey(), hfMerchantConfig.getAppId(), accountInfo);
+        PaymentMerchant.MerchantConfig merchantConfig = getMerchantConfig(PaymentChannelEnum.ADAPAY.getCode(), TenantContextHolder.getTenantId());
+        String settleAccount = paymentService.createSettleAccount(merchantConfig, getAccountInfo(accountInfo));
 
-        hfMember.setSettleAccountId(settleAccountId);
+        hfMember.setSettleAccountId(settleAccount);
         if (hfMemberDao.update(hfMember) <= 0) {
             throw new BizException("绑卡失败，请重试");
         }
         return true;
     }
-    
+
+    private PaymentMerchant.AccountInfo getAccountInfo(AccountInfo accountInfo) {
+        return PaymentMerchant.AccountInfo.builder()
+                .memberId(accountInfo.getMemberId())
+                .cardId(accountInfo.getCardId())
+                .cardName(accountInfo.getCardName())
+                .certId(accountInfo.getCertId())
+                .certType(accountInfo.getCertType())
+                .telNo(accountInfo.getTelNo())
+                .bankCode(accountInfo.getBankCode())
+                .bankName(accountInfo.getBankName())
+                .bankAcctType(accountInfo.getBankAcctType())
+                .provCode(accountInfo.getProvCode())
+                .areaCode(accountInfo.getAreaCode())
+                .build();
+    }
+
+    @Override
+    public Map<String, Object> queryWithKey(String appId, String merKey, int pageIndex, long createdGte, long createdLte) {
+        Map<java.lang.String, java.lang.Object> paymentParams = new HashMap<>();
+        paymentParams.put("app_id", appId);
+        paymentParams.put("page_index", pageIndex);
+        paymentParams.put("page_size", "20");
+        paymentParams.put("created_gte", createdGte);
+        paymentParams.put("created_lte", createdLte);
+        Map<String, Object> payment = null;
+        try {
+            payment = com.huifu.adapay.model.Payment.queryList(paymentParams, merKey);
+        } catch (BaseAdaPayException e) {
+            throw new BizException("查询支付对象列表失败:{}", e, e.getMessage());
+        }
+        String error_code = (String) payment.get("error_code");
+        if (null != error_code) {
+            String errorMsg = (String) payment.get("error_msg");
+            throw new ThirdpartyException(errorMsg);
+        }
+        return payment;
+    }
+
+    @Override
+    public Map<String, Object> queryConfirmList(String appId, String merchantKey, String paymentId){
+        Map<String, Object> paymentParams = new HashMap<>();
+        paymentParams.put("app_id", appId);
+        paymentParams.put("payment_id", paymentId);
+
+        Map<String, Object> payment = null;
+        try {
+            payment = com.huifu.adapay.model.Payment.queryConfirmList(paymentParams, merchantKey);
+        } catch (BaseAdaPayException e) {
+            throw new BizException("查询支付确认列表失败:{}", e, e.getMessage());
+        }
+        String error_code = (String) payment.get("error_code");
+        if (null != error_code) {
+            String errorMsg = (String) payment.get("error_msg");
+            throw new ThirdpartyException(errorMsg);
+        }
+        return payment;
+    }
+    /*
 	private boolean createMemberWithAdapay(HfMember member, File file) {
 		Integer tenantId = member.getTenantId();
 
@@ -347,5 +476,5 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
 		}
 		
 		return yeepayMerchantService.registerSaasMerchantV2(hfMerchantConfig, merchantInfo, notifyURL);
-	}
+	}*/
 }

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

@@ -1,81 +1,57 @@
 package com.ym.mec.biz.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentConfig;
-import com.microsvc.toolkit.middleware.payment.common.api.BasePaymentService;
-import com.microsvc.toolkit.middleware.payment.common.api.PaymentServiceContext;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSON;
-import com.ym.mec.biz.dal.dao.GoodsProcurementDao;
 import com.ym.mec.biz.dal.dao.HfMemberDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentRouteOrderDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.AmountChannelDto;
 import com.ym.mec.biz.dal.dto.RouteScaleDto;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.GoodsProcurement;
-import com.ym.mec.biz.dal.entity.HfMember;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
-import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
-import com.ym.mec.biz.dal.entity.SysPaymentConfig;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.FeeTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.enums.PaymentChannelEnum;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.HfMerchantConfigService;
-import com.ym.mec.biz.service.PayService;
-import com.ym.mec.biz.service.SellOrderService;
-import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.SysConfigService;
-import com.ym.mec.biz.service.SysPaymentConfigService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.exception.BizException;
-import com.ym.mec.common.redis.service.RedisCache;
 import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;
 import com.ym.mec.util.date.DateUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 /**
  * 支付服务类
  */
 @Service
 public class PayServiceImpl implements PayService {
-    @Autowired
+    @Resource
     private StudentPaymentOrderService studentPaymentOrderService;
-    
-    @Autowired
+    @Resource
     private StudentPaymentOrderDetailService studentPaymentOrderDetailService;
-    
-    @Autowired
+    @Resource
     private GoodsService goodsService;
-    
-    @Autowired
+    @Resource
     private HfMerchantConfigService hfMerchantConfigService;
-    
-    @Autowired
+    @Resource
     private SysConfigDao sysConfigDao;
-    @Autowired
+    @Resource
     private SysPaymentConfigService sysPaymentConfigService;
-    @Autowired
+    @Resource
     private StudentPaymentRouteOrderDao studentPaymentRouteOrderDao;
-    @Autowired
+    @Resource
     private SellOrderService sellOrderService;
-    @Autowired
+    @Resource
     private HfMemberDao hfMemberDao;
-    
-    @Autowired
+    @Resource
     private StudentPaymentOrderDao studentPaymentOrderDao;
 
     @Override

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.portal.controller;
 
-import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.huifu.adapay.core.AdapayCore;
@@ -8,30 +7,25 @@ import com.huifu.adapay.core.util.AdapaySign;
 import com.yeepay.g3.sdk.yop.encrypt.DigitalEnvelopeDTO;
 import com.yeepay.g3.sdk.yop.utils.DigitalEnvelopeUtils;
 import com.yeepay.g3.sdk.yop.utils.RSAKeyUtils;
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 import com.ym.mec.web.WebFeignService;
 import com.yonge.cooleshow.mall.common.enums.OrderCacheEnum;
 import com.yonge.cooleshow.mbg.model.UserOrderPayment;
-import com.yonge.cooleshow.portal.dto.OrderPayRes;
 import com.yonge.cooleshow.portal.service.OmsPortalOrderService;
 import com.yonge.cooleshow.portal.service.UserOrderPaymentService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.security.PrivateKey;
 import java.security.PublicKey;
@@ -49,19 +43,16 @@ import java.util.concurrent.TimeUnit;
 public class PaymentController extends BaseController {
     private final static Logger log = LoggerFactory.getLogger(PaymentController.class);
 
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-    @Autowired
+    @Resource
     private OmsPortalOrderService orderService;
 
-    @Autowired
+    @Resource
     private RedissonClient redissonClient;
 
-    @Autowired
+    @Resource
     private UserOrderPaymentService userOrderPaymentService;
 
-    @Autowired
+    @Resource
     private WebFeignService webFeignService;
 
 

mec-mall/pom.xml

@@ -24,7 +24,11 @@
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.microsvc.toolkit.middleware</groupId>
+            <artifactId>microsvc-middleware-payment</artifactId>
+            <version>${microsvc.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>

mec-thirdparty/pom.xml

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

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/CorpMemberService.java

@@ -1,25 +1,13 @@
 package com.ym.mec.thirdparty.adapay;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import com.huifu.adapay.core.exception.BaseAdaPayException;
-import com.huifu.adapay.model.AdapayCommon;
-import com.huifu.adapay.model.CorpMember;
-import com.ym.mec.thirdparty.adapay.entity.EnterpriseUser;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-
 /**
  * 企业用户相关服务
  */
 @Service
 public class CorpMemberService {
-
+/*
 	private final static Logger logger = LoggerFactory.getLogger(CorpMemberService.class);
 
 	public boolean create(String merchantKey, String appId, EnterpriseUser req, String notifyUrl) {
@@ -134,6 +122,6 @@ public class CorpMemberService {
 		}
 
 		return null;
-	}
+	}*/
 	
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -1,27 +1,16 @@
 package com.ym.mec.thirdparty.adapay;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.*;
-
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Lists;
-import com.huifu.adapay.core.exception.BaseAdaPayException;
-import com.huifu.adapay.core.util.StringUtil;
-import com.huifu.adapay.model.PaymentReverse;
-import com.huifu.adapay.model.Refund;
-import com.ym.mec.thirdparty.adapay.entity.BaseResult;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.DigestUtils;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 public class Payment {
 
 	private final static Logger LOGGER = LoggerFactory.getLogger(Payment.class);
@@ -31,7 +20,7 @@ public class Payment {
      * @return 创建的支付对象
      * @throws Exception 异常
      */
-    public static Map<String, Object> executePayment(String appId, String merchantKey, Map<String, Object> paymentParams) throws Exception {
+    /*public static Map<String, Object> executePayment(String appId, String merchantKey, Map<String, Object> paymentParams) throws Exception {
         paymentParams.put("app_id", appId);
 
         LOGGER.info("汇付[创建支付对象] Req：{}", paymentParams);
@@ -52,12 +41,12 @@ public class Payment {
     }
 
 
-    /**
+    *//**
      * 创建确认对象
      *
      * @return 查询的支付对象
      * @throws Exception 异常
-     */
+     *//*
     public static Map<String, Object> createConfirm(Map<String, Object> confirm, String merchantKey) throws Exception {
         confirm = com.huifu.adapay.model.Payment.createConfirm(confirm, merchantKey);
 
@@ -69,13 +58,12 @@ public class Payment {
         return confirm;
     }
 
-    /**
+    *//**
      * 查询一个支付交易
      *
-     * @param paymentId 要查询的支付id
      * @return 查询的支付对象
      * @throws Exception 异常
-     */
+     *//*
     public static Map<String, Object> queryPayment(String paymentId, String merchantKey) throws Exception {
         LOGGER.info("=======query payment begin=======");
         //查询支付对象的参数，全部参数请参考 https://docs.adapay.tech/api/04-trade.html#id7
@@ -96,10 +84,10 @@ public class Payment {
         }
         LOGGER.info("queryPayment >>> =======query payment end=======");
         return payment;
-    }
+    }*/
 
 
-    public static Map<String, Object> queryList(String appId, String merchantKey, Integer pageIndex, Long createdGte, Long createdLte) throws Exception {
+    /*public static Map<String, Object> queryList(String appId, String merchantKey, Integer pageIndex, Long createdGte, Long createdLte) throws Exception {
         Map<java.lang.String, java.lang.Object> paymentParams = new HashMap<>();
         paymentParams.put("app_id", appId);
         paymentParams.put("page_index", pageIndex);
@@ -113,8 +101,8 @@ public class Payment {
             throw new ThirdpartyException(errorMsg);
         }
         return payment;
-    }
-
+    }*/
+/*
     public static Map<String, Object> queryConfirmList(String appId, String merchantKey, String paymentId) throws Exception {
         Map<String, Object> paymentParams = new HashMap<>();
         paymentParams.put("app_id", appId);
@@ -127,7 +115,7 @@ public class Payment {
             throw new ThirdpartyException(errorMsg);
         }
         return payment;
-    }
+    }*/
 
     public static Map<String, Object> getPayMap(HfMerchantConfig hfMerchantConfig, BigDecimal amount, String orderNo, String returnUrl, String orderSubject, String orderBody) throws Exception {
 
@@ -150,7 +138,7 @@ public class Payment {
         paymentParams.remove("appId");
         return paymentParams;
     }
-
+/*
     public static BaseResult<Map<String ,Object>> refundPayment(Map<String, Object> refundParams) {
 
         LOGGER.info("退款对象信息：{}",refundParams);
@@ -204,7 +192,7 @@ public class Payment {
     }
 
 
-    /**
+    *//**
      *
      针对已经创建的 支付对象，您可以调用关单接口进行交易的关闭。调用此接口后，该用户订单将不再能支付成功。 对于关单功能的使用有如下规则：
      1.存在关单记录，不能再次关单
@@ -217,7 +205,7 @@ public class Payment {
      * @param reason 原因
      * @param merchantKey 商户Key
      * @return Map<String, Object>
-     */
+     *//*
     public static Map<String ,String> closeWithKey(String transNo, String reason, String merchantKey) {
 
 
@@ -259,6 +247,6 @@ public class Payment {
         result.put("status", "success");
 
         return result;
-    }
+    }*/
 
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/SettleAccountService.java

@@ -1,22 +1,14 @@
 package com.ym.mec.thirdparty.adapay;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
-import com.huifu.adapay.core.exception.BaseAdaPayException;
-import com.ym.mec.thirdparty.adapay.entity.AccountInfo;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-
 /**
  * 结算账户服务
  * 注：若用户想更新银行卡，则需要先调用删除结算账户对象，再使用原 member_id 重新创建结算账户对象，且必须与原创建结算账户使用的身份证和银行卡户名保持一致。
  */
 @Service
 public class SettleAccountService {
-
+/*
 	public String create(String merchantKey, String appId, AccountInfo accountInfo) {
 		Map<String, Object> settleCountParams = new HashMap<String, Object>();
 		Map<String, Object> accountInfoMap = new HashMap<String, Object>();
@@ -60,5 +52,5 @@ public class SettleAccountService {
 			new ThirdpartyException("结算账户删除失败:{}", e, e.getMessage());
 		}
 		return false;
-	}
+	}*/
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayMerchantService.java

@@ -1,26 +1,15 @@
 package com.ym.mec.thirdparty.yeepay;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.yeepay.g3.sdk.yop.client.YopRequest;
-import com.yeepay.g3.sdk.yop.client.YopResponse;
-import com.yeepay.g3.sdk.yop.client.YopRsaClient;
-import com.yeepay.g3.sdk.yop.exception.YopClientException;
-import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import com.ym.mec.thirdparty.yeepay.entity.MerchantInfo;
-
 @Service
 public class YeepayMerchantService {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(YeepayMerchantService.class);
 
+	private static final Logger LOGGER = LoggerFactory.getLogger(YeepayMerchantService.class);
+/*
 	public JSONObject registerQueryV2(HfMerchantConfig hfMerchantConfig, String requestNo) throws IOException {
 
 		YopRequest request = new YopRequest(hfMerchantConfig.getAppId(), hfMerchantConfig.getRsaPrivateKey());
@@ -103,6 +92,6 @@ public class YeepayMerchantService {
 
 	public void merchantInfoModify(String merchantNo, MerchantInfo merchantInfo, String notifyURL) throws YopClientException {
 
-	}
+	}*/
 
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayPaymentService.java

@@ -1,27 +1,10 @@
 package com.ym.mec.thirdparty.yeepay;
 
-import java.io.IOException;
-import java.util.*;
-
-import com.google.common.collect.Lists;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.yeepay.g3.sdk.yop.client.YopRequest;
-import com.yeepay.g3.sdk.yop.client.YopResponse;
-import com.yeepay.g3.sdk.yop.client.YopRsaClient;
-import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import com.ym.mec.thirdparty.exception.ThirdpartyException;
-import com.ym.mec.util.date.DateUtil;
-
 @Service
 public class YeepayPaymentService {
-
+/*
 	private static final Logger LOGGER = LoggerFactory.getLogger(YeepayPaymentService.class);
 
 	public Map<String, Object> prePay(HfMerchantConfig hfMerchantConfig, Map<String, Object> params) throws IOException {
@@ -107,12 +90,12 @@ public class YeepayPaymentService {
 	}
 
 
-    /**
+    *//**
      * 关闭订单
      * @param transNo 交易流水号
      * @param reason 原因
      * @return Map<String, Object>
-     */
+     *//*
     public Map<String,String> close(HfMerchantConfig hfMerchantConfig,String transNo, String reason, String outTransNo) {
 
 
@@ -162,5 +145,5 @@ public class YeepayPaymentService {
 
 
         return result;
-    }
+    }*/
 }

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayUploadService.java

@@ -1,23 +1,14 @@
 package com.ym.mec.thirdparty.yeepay;
 
-import java.io.File;
-import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.fastjson.JSONObject;
-import com.yeepay.g3.sdk.yop.client.YopRequest;
-import com.yeepay.g3.sdk.yop.client.YopResponse;
-import com.yeepay.g3.sdk.yop.client.YopRsaClient;
-import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-
 @Service
 public class YeepayUploadService {
 	
 	private static final Logger LOGGER = LoggerFactory.getLogger(YeepayUploadService.class);
-
+/*
 	public String upload(HfMerchantConfig hfMerchantConfig, File file) {
 		
 		YopRequest request = new YopRequest(hfMerchantConfig.getAppId(), hfMerchantConfig.getRsaPrivateKey());
@@ -37,5 +28,5 @@ public class YeepayUploadService {
         
         return null;
 		
-	}
+	}*/
 }

pom.xml

@@ -27,7 +27,7 @@
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.8-RC1</com.microsvc.toolkit.version>
 		<cbs.version>1.0.26</cbs.version>
-		<microsvc.version>1.1.9</microsvc.version>
+		<microsvc.version>1.2.0</microsvc.version>
 	</properties>
 
 	<dependencyManagement>