update:开户支持个体户

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/YeepayMember.java

@@ -16,6 +16,8 @@ public class YeepayMember extends HfMember {
 	private String licenceUrl; //商户证件照片
 	
 	private String openAccountLicenceUrl; //开户许可证照片
+	
+    private String merchantType;//商家类型（企业-ENTERPRISE，个体户-INDIVIDUAL）
 
 	public String getLegalLicenceFrontUrl() {
 		return legalLicenceFrontUrl;
@@ -48,4 +50,12 @@ public class YeepayMember extends HfMember {
 	public void setOpenAccountLicenceUrl(String openAccountLicenceUrl) {
 		this.openAccountLicenceUrl = openAccountLicenceUrl;
 	}
+
+	public String getMerchantType() {
+		return merchantType;
+	}
+
+	public void setMerchantType(String merchantType) {
+		this.merchantType = merchantType;
+	}
 }

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

@@ -268,6 +268,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
 		merchantInfo.setLegalName(member.getLegalPerson());
 		merchantInfo.setLicenceNo(member.getSocialCreditCode());
 		merchantInfo.setLicenceUrl(member.getLicenceUrl());
+		merchantInfo.setMerchantType(member.getMerchantType());
 		merchantInfo.setMerchantName(member.getName());
 		merchantInfo.setMobile(member.getLegalMp());
 		merchantInfo.setOpenAccountLicenceUrl(member.getOpenAccountLicenceUrl());

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

@@ -47,7 +47,7 @@ public class YeepayMerchantService {
 		Map<String, String> merchantSubjectInfoMap = new HashMap<String, String>();
 		merchantSubjectInfoMap.put("licenceUrl", merchantInfo.getLicenceUrl());
 		merchantSubjectInfoMap.put("signName", merchantInfo.getMerchantName());
-		merchantSubjectInfoMap.put("signType", "ENTERPRISE");
+		merchantSubjectInfoMap.put("signType", merchantInfo.getMerchantType());
 		merchantSubjectInfoMap.put("licenceNo", merchantInfo.getLicenceNo());
 		merchantSubjectInfoMap.put("shortName", merchantInfo.getMerchantName());
 		merchantSubjectInfoMap.put("openAccountLicenceUrl", merchantInfo.getOpenAccountLicenceUrl());

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/entity/MerchantInfo.java

@@ -5,6 +5,8 @@ public class MerchantInfo {
 	private String requestNo;
 
 	//-----企业信息
+    private String merchantType;//商家类型（企业-ENTERPRISE，个体户-INDIVIDUAL）
+    
 	private String merchantName; //企业名称
 	
 	private String licenceNo; //商户证件编号
@@ -65,6 +67,14 @@ public class MerchantInfo {
 		this.requestNo = requestNo;
 	}
 
+	public String getMerchantType() {
+		return merchantType;
+	}
+
+	public void setMerchantType(String merchantType) {
+		this.merchantType = merchantType;
+	}
+
 	public String getMerchantName() {
 		return merchantName;
 	}

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

@@ -150,7 +150,7 @@ public class YeepayController extends BaseController {
 			}else if("REVIEW_BACK".equals(dataObj.getString("applicationStatus"))) {
 				//审核驳回
 				hfMember.setStatus("failed");
-				hfMember.setMemo(dataObj.getString("returnMsg"));
+				hfMember.setMemo(dataObj.getString("auditOpinion"));
 				hfMemberService.update(hfMember);
 			}