diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayModeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayModeEnum.java index 2d7875848..d8747c70c 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayModeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderPayModeEnum.java @@ -6,11 +6,11 @@ package com.jsowell.common.enums.ykc; * 前端给的参数 */ public enum OrderPayModeEnum { - PAYMENT_OF_BALANCE("1", "余额支付"), PAYMENT_OF_WHITELIST("3", "白名单支付"), PAYMENT_OF_WECHATPAY("4", "微信支付"), PAYMENT_OF_ALIPAY("5", "支付宝支付"), + PAYMENT_OF_ETC("6", "ETC支付"), ; private String value; diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java index 2b5ca0643..164eb865c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java +++ b/jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java @@ -898,7 +898,7 @@ public class AdapayService { /** * 创建余额支付请求 - * + * 汇付余额转账 * @param outMemberId 出账用户的member_id, 若为商户本身时,请传入0 * @param inMemberId 入账用户的member_id, 若为商户本身时,请传入0 * @param transAmt 交易金额, 必须大于0,保留两位小数点,如0.10、100.05等 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 5cead444f..e4d6d73f9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -447,8 +447,8 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { // 微信支付 onlinePaymentOrderRefund(orderBasicInfo); } else { - // 白名单支付 - logger.info("订单:{}使用白名单支付,不进行退款处理", orderBasicInfo.getOrderCode()); + // 白名单支付或者ETC支付 + logger.info("订单:{}使用:{},不进行退款处理", orderBasicInfo.getOrderCode(), OrderPayModeEnum.getPayModeDescription(payMode)); } } catch (Exception e) { logger.error("【{}】-订单退款逻辑异常orderCode:{}", this.getClass().getSimpleName(), orderBasicInfo.getOrderCode(), e);