update

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import java.io.File;
 import java.util.Date;
 
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -41,6 +42,8 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
     @Value("${spring.profiles.active:dev}")
     private String env;
 
+	private String cardName;
+
     @Override
     public BaseDAO<Integer, HfMember> getDAO() {
         return hfMemberDao;
@@ -166,10 +169,20 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
         if (!hfMember.getStatus().equals("succeeded")) {
             throw new BizException("商户审核通过，才能绑定结算卡");
         }
-        hfMember.setCardNo(accountInfo.getCardId());
+        /*hfMember.setCardNo(accountInfo.getCardId());
         hfMember.setBankCode(accountInfo.getBankCode());
         hfMember.setBankAcctType(accountInfo.getBankAcctType());
-        hfMember.setCardName(accountInfo.getCardName());
+        hfMember.setCardName(accountInfo.getCardName());*/
+        
+        accountInfo.setAreaCode(hfMember.getAreaCode());
+        accountInfo.setBankAcctType(hfMember.getBankAcctType());
+        accountInfo.setBankCode(hfMember.getBankCode());
+        accountInfo.setBankName(hfMember.getBankCode());
+        accountInfo.setCardId(hfMember.getCardNo());
+        accountInfo.setCardName(hfMember.getCardName());
+        accountInfo.setMemberId(memberId);
+        accountInfo.setProvCode(hfMember.getProvCode());
+        accountInfo.setTelNo(hfMember.getLegalMp());
         
         Integer tenantId = hfMember.getTenantId();
         

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -41,7 +41,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/tenantInfo/info/*", "/tenantInfo/checkInfo/*", "/tenantInfo/pay/*","/tenantInfo/testCheck", "/tenantInfo/getContract/*",
                         "/tenantPreJoin/add","/imLiveBroadcastRoom/queryRoomInfo","/imLiveBroadcastRoom/test",
                         "/eduOrganization/queryAllOrgan","/eduOrganization/getOrganCooperation","/import/oaUploadFile",
-                        "/tenantInfo/callback"
+                        "/tenantInfo/callback","/adapay/callback"
                 )
                 .permitAll().anyRequest().authenticated().and().httpBasic();
     }