update

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentPaymentOrder.java

@@ -25,6 +25,8 @@ public class StudentPaymentOrder extends BaseEntity {
 	private Long id;
 	
 	private GroupType groupType;
+	
+	private String payerName;
 
 	@Version
 	private Integer version;
@@ -144,6 +146,14 @@ public class StudentPaymentOrder extends BaseEntity {
 		this.calenderId = calenderId;
 	}
 
+	public String getPayerName() {
+		return payerName;
+	}
+
+	public void setPayerName(String payerName) {
+		this.payerName = payerName;
+	}
+
 	public Integer getActivityBuyNum() {
 		return activityBuyNum;
 	}

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

@@ -14,7 +14,7 @@ public interface HfMemberService extends BaseService<Integer, HfMember> {
      * @param memberId
      * @return
      */
-    HfMember getByMemberId(String memberId);
+    HfMember getByMemberId(String memberId, String payerName);
 
     boolean createMember(HfMember member, File file) throws Exception;
 

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

@@ -477,7 +477,7 @@ public class ExportServiceImpl implements ExportService {
         List<Map<String, Object>> data = new ArrayList<>();
         while (profiles.equals("prod")) {
             Map<String, Object> paymentList = null;
-            HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(TenantContextHolder.getTenantId());
+            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/HfMemberServiceImpl.java

@@ -57,8 +57,8 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
     }
 
     @Override
-	public HfMember getByMemberId(String memberId) {
-		return hfMemberDao.getByMemberId(memberId);
+	public HfMember getByMemberId(String memberId, String payerName) {
+		return hfMemberDao.getByMemberId(memberId, payerName);
 	}
 
 	@Override

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

@@ -555,7 +555,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     private void checkOrder(StudentPaymentOrder orderByOrderNo) throws Exception {
         if (StringUtils.isNotBlank(orderByOrderNo.getTransNo())) {
 
-            HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(orderByOrderNo.getTenantId());
+            HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(orderByOrderNo.getTenantId(), orderByOrderNo.getPayerName());
             if(hfMerchantConfig == null){
             	throw new BizException("机构[{}]汇付商户信息找不到", orderByOrderNo.getTenantId());
             }

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

@@ -98,7 +98,7 @@ public class PayServiceImpl implements PayService {
         
         Integer tenantId = studentPaymentOrder.getTenantId();
         
-        HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(tenantId);
+        HfMerchantConfig hfMerchantConfig = hfMerchantConfigService.queryByTenantId(tenantId, studentPaymentOrder.getPayerName());
         if(hfMerchantConfig == null){
         	throw new BizException("机构[{}]汇付商户信息找不到", tenantId);
         }

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -8,6 +8,7 @@
 
     <resultMap type="com.ym.mec.biz.dal.entity.StudentPaymentOrder" id="StudentPaymentOrder">
         <result column="id_" property="id"/>
+        <result column="payer_name_" property="payerName"/>
         <result column="group_type_" property="groupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="user_id_" property="userId"/>
         <result column="organ_id_" property="organId"/>
@@ -105,13 +106,13 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder" useGeneratedKeys="true"
             keyColumn="id" keyProperty="id">
         INSERT INTO student_payment_order
-        (group_type_, user_id_, organ_id_, routing_organ_id_, type_, expect_amount_, actual_amount_, com_amount_,
+        (payer_name_, group_type_, user_id_, organ_id_, routing_organ_id_, type_, expect_amount_, actual_amount_, com_amount_,
          per_amount_,
          balance_payment_amount_, remit_fee_, course_remit_fee_, trans_no_,
          status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
          payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_,batch_no_,coupon_code_id_,
          coupon_remit_fee_,activity_id_,activity_buy_num_,tenant_id_,calender_id_)
-        VALUES (#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        VALUES (#{payerName}, #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{userId}, #{organId}, #{routingOrganId},
                 #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{expectAmount}, #{actualAmount}, #{comAmount}, #{perAmount}, #{balancePaymentAmount},
@@ -127,6 +128,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentPaymentOrder">
         UPDATE student_payment_order
         <set>
+            <if test="payerName != null">
+                payer_name_ = #{payerName},
+            </if>
             <if test="activityBuyNum != null">
                 activity_buy_num_ = #{activityBuyNum},
             </if>
@@ -220,6 +224,9 @@
 		<foreach collection="studentPaymentOrderList" item="studentPaymentOrder" separator=";">
 	        UPDATE student_payment_order
 	        <set>
+	            <if test="studentPaymentOrder.payerName != null">
+	                payer_name_ = #{studentPaymentOrder.payerName},
+	            </if>
                 <if test="studentPaymentOrder.activityBuyNum != null">
                     activity_buy_num_ = #{studentPaymentOrder.activityBuyNum},
                 </if>
@@ -446,6 +453,9 @@
             <if test="paymentStatus != null">
                 AND spo.status_ = #{paymentStatus}
             </if>
+            <if test="payerName != null">
+                AND spo.payer_name_ = #{payerName}
+            </if>
             <if test="paymentChannel != null">
                 AND spo.payment_channel_ NOT IN (#{paymentChannel})
             </if>

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

@@ -77,7 +77,7 @@ public class YeepayMerchantService {
         request.setBusinessAddressInfo(JSONObject.toJSONString(businessAddressInfoMap));
         
         Map<String,String> settlementAccountInfoMap = new HashMap<String, String>();
-        settlementAccountInfoMap.put("settlementDirection", merchantInfo.getSettlementDirection());
+        settlementAccountInfoMap.put("settlementDirection", "BANKCARD");
         settlementAccountInfoMap.put("bankCode", merchantInfo.getBankCode());
         settlementAccountInfoMap.put("bankAccountType", merchantInfo.getBankAccountType());
         settlementAccountInfoMap.put("bankCardNo", merchantInfo.getBankCardNo());

mec-web/src/main/java/com/ym/mec/web/controller/HfMerchantConfigController.java

@@ -68,9 +68,9 @@ public class HfMerchantConfigController extends BaseController {
     }
 
     @ApiOperation("根据机构id查询汇付商户配置")
-    @GetMapping(value = "/queryByTenantId/{id}")
-    public HttpResponseResult<HfMerchantConfig> queryByTenantId(@ApiParam(value = "机构ID", required = true) @PathVariable("id") Integer id) {
-        return succeed(hfMerchantConfigService.queryByTenantId(id));
+    @GetMapping(value = "/queryByTenantId/{payerName}/{id}")
+    public HttpResponseResult<HfMerchantConfig> queryByTenantId(@PathVariable("payerName") String payerName, @ApiParam(value = "机构ID", required = true) @PathVariable("id") Integer id) {
+        return succeed(hfMerchantConfigService.queryByTenantId(id, payerName));
     }
 
     @ApiOperation("分页查询汇付商户配置")