feat:config sub channel

repository/src/main/java/com/jiejing/fitness/finance/repository/service/MerchantSettleRecordRpService.java

@@ -46,7 +46,7 @@ public class MerchantSettleRecordRpService extends
     wrapper.in(MerchantSettleRecord.TRANS_STATE, Lists.newArrayList(
     wrapper.in(MerchantSettleRecord.TRANS_STATE, Lists.newArrayList(
         TransStateEnums.INIT.getCode(), TransStateEnums.PROCESS.getCode()
         TransStateEnums.INIT.getCode(), TransStateEnums.PROCESS.getCode()
     ));
     ));
-    wrapper.orderByAsc(MerchantSettleRecord.ID);
+    wrapper.orderByAsc(MerchantSettleRecord.SETTLE_DATE);
     return Optional.ofNullable(this.baseMapper.selectList(wrapper)).orElse(new ArrayList<>(1));
     return Optional.ofNullable(this.baseMapper.selectList(wrapper)).orElse(new ArrayList<>(1));
   }
   }
 
 

service/src/main/java/com/jiejing/fitness/finance/service/enums/FinanceErrorEnums.java

@@ -25,7 +25,15 @@ public enum FinanceErrorEnums implements BaseBizError {
   NOT_SUPPORT_FILE_TYPE("不支持的文件类型"),
   NOT_SUPPORT_FILE_TYPE("不支持的文件类型"),
   EXIST_PROCESS_APPLY("存在处理中的申请"),
   EXIST_PROCESS_APPLY("存在处理中的申请"),
   EXIST_BIND_RECORD("存在已经绑定的流水"),
   EXIST_BIND_RECORD("存在已经绑定的流水"),
-  PAY_FAIL("支付失败"),
+  PAY_FAIL("{0}"),
+  PAY_FAIL_1("支付失败，请联系场馆工作人员处理。"),
+  PAY_FAIL_2("收款账户状态异常，请联系场馆工作人员处理。"),
+  PAY_FAIL_3("网络异常支付失败，请重新支付。"),
+  PAY_FAIL_4("支付失败，请联系场馆工作人员进行微信授权。"),
+  PAY_FAIL_5("支付失败，请联系场馆工作人员进行支付宝授权。"),
+  PAY_FAIL_6("该场馆单笔收款有额度限制，请联系场馆提升收款额度或者分多笔订单支付。"),
+  PAY_FAIL_7("该场馆单日收款有额度限制，请联系场馆提升收款额度。"),
+
   ;
   ;
 
 
   @Getter
   @Getter

service/src/main/java/com/jiejing/fitness/finance/service/pay/enums/PayFailMessageReplaceEnums.java

 package com.jiejing.fitness.finance.service.pay.enums;
 package com.jiejing.fitness.finance.service.pay.enums;
 
 
+import static com.jiejing.fitness.finance.service.enums.FinanceErrorEnums.*;
+import static com.jiejing.fitness.finance.service.enums.FinanceErrorEnums.PAY_FAIL_1;
+import static com.jiejing.fitness.finance.service.enums.FinanceErrorEnums.PAY_FAIL_4;
+import static com.jiejing.fitness.finance.service.enums.FinanceErrorEnums.PAY_FAIL_5;
+
+import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
 import java.util.Arrays;
 import java.util.Arrays;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;
@@ -15,27 +21,24 @@ public enum PayFailMessageReplaceEnums {
   /**
   /**
    *
    *
    */
    */
-  E1("交易失败，结算账户状态异常", "收款账户状态异常，请联系场馆工作人员处理。"),
-  E2("参数buyerId和buyerLongId不能同时为空", "网络异常支付失败，请重新支付。"),
-  E3("参数openId不能为空", "网络异常支付失败，请重新支付。"),
-  E4("特约子商户该产品权限已被冻结，请前往商户平台>产品中心检查后重试", "支付失败，请联系场馆工作人员处理。"),
-  E5("当前商户需补齐相关资料后，才可进行相应的支付交易，请商户联系对接的微信支付服务商",
-      "支付失败，请联系场馆工作人员进行微信授权。"),
-  E6("当前商户需补齐相关资料后，才可进行相应的支付交易，请商户联系对接的支付宝服务商",
-      "支付失败，请联系场馆工作人员进行支付宝授权。"),
-  E7("商户不存在", "支付失败，请联系场馆工作人员处理。"),
-  E8("风控拦截[单笔限额拦截]", "该场馆单笔收款有额度限制，请联系场馆提升收款额度或者分多笔订单支付。"),
-  E9("风控拦截[单日限额拦截]", "该场馆单日收款有额度限制，请联系场馆提升收款额度。"),
-  E10("交易失败，请重试cashCode:38 cashDesc: 该商户无此通道入驻记录或商户不可用！",
-      "支付失败，请联系场馆工作人员处理。"),
-  OTHER("OTHER", "支付失败，请联系场馆工作人员处理。"),
+  OTHER("OTHER", PAY_FAIL_1),
+  E1("交易失败，结算账户状态异常", PAY_FAIL_2),
+  E2("参数buyerId和buyerLongId不能同时为空", PAY_FAIL_3),
+  E3("参数openId不能为空", PAY_FAIL_3),
+  E4("特约子商户该产品权限已被冻结，请前往商户平台>产品中心检查后重试", PAY_FAIL_1),
+  E5("当前商户需补齐相关资料后，才可进行相应的支付交易，请商户联系对接的微信支付服务商", PAY_FAIL_4),
+  E6("当前商户需补齐相关资料后，才可进行相应的支付交易，请商户联系对接的支付宝服务商", PAY_FAIL_5),
+  E7("商户不存在", PAY_FAIL_1),
+  E8("风控拦截[单笔限额拦截]", PAY_FAIL_6),
+  E9("风控拦截[单日限额拦截]", PAY_FAIL_7),
+  E10("交易失败，请重试cashCode:38 cashDesc: 该商户无此通道入驻记录或商户不可用！", PAY_FAIL_1),
   ;
   ;
 
 
   private final String source;
   private final String source;
 
 
-  private final String target;
+  private final FinanceErrorEnums target;
 
 
-  public static String convertBySource(String source) {
+  public static FinanceErrorEnums convertBySource(String source) {
     if (null == source) {
     if (null == source) {
       return OTHER.getTarget();
       return OTHER.getTarget();
     }
     }

service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/PayServiceImpl.java

@@ -186,7 +186,7 @@ public class PayServiceImpl implements PayService {
     StudioVO studio = studioRpcService.getStudio(params.getStudioId());
     StudioVO studio = studioRpcService.getStudio(params.getStudioId());
     PartyToMerchant relation = partyToMerchantRpService.getByStudioId(studio.getId(), config.getCashier());
     PartyToMerchant relation = partyToMerchantRpService.getByStudioId(studio.getId(), config.getCashier());
     if (null == relation) {
     if (null == relation) {
-      throw new BizException(FinanceErrorEnums.PAY_FAIL, PayFailMessageReplaceEnums.E7.getTarget());
+      throw new BizException(FinanceErrorEnums.PAY_FAIL_1);
     }
     }
 
 
     MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
     MerchantVO merchant = merchantRpcService.getByMerchantId(relation.getMerchantId());
@@ -200,12 +200,12 @@ public class PayServiceImpl implements PayService {
     this.payCallback(PayConvert.convertEvent(request, vo));
     this.payCallback(PayConvert.convertEvent(request, vo));
 
 
     if (PayStateEnums.FAILED == PayStateEnums.getByCode(vo.getPayState())) {
     if (PayStateEnums.FAILED == PayStateEnums.getByCode(vo.getPayState())) {
-      throw new BizException(FinanceErrorEnums.PAY_FAIL, replaceFailMessage(vo.getFailMsg()));
+      throw new BizException(replaceFailMessage(vo.getFailMsg()));
     }
     }
     return vo;
     return vo;
   }
   }
 
 
-  private String replaceFailMessage(String failMsg) {
+  private FinanceErrorEnums replaceFailMessage(String failMsg) {
     return PayFailMessageReplaceEnums.convertBySource(failMsg);
     return PayFailMessageReplaceEnums.convertBySource(failMsg);
   }
   }