diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index bfb80469f..00cab42c3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -864,8 +864,8 @@ public class OrderService { // 余额支付 result.add( PayModeVO.builder() - .payModeCode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()) - .payModeName(OrderPayModeEnum.PAYMENT_OF_BALANCE.getLabel()) + .payModeCode(OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()) + .payModeName(OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getLabel()) .build() ); } @@ -1201,7 +1201,8 @@ public class OrderService { PayOrderSuccessCallbackDTO callbackDTO = PayOrderSuccessCallbackDTO.builder() .orderCode(orderCode) .payAmount(amount) - .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) + // .payMode(OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue()) + .payMode(payModel) .acquirer(AcquirerEnum.ADAPAY.getValue()) .build(); // 订单支付成功 支付回调 diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 3507bc2ed..f44eb5df9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -112,7 +112,7 @@ public class TempService { try { OrderSettleResult orderSettleResult = null; logger.info("手动接口执行订单分账逻辑-orderCode:{}, payMode:{}", orderBasicInfo.getOrderCode(), orderBasicInfo.getPayMode()); - if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { logger.info("手动接口执行订单分账逻辑-order:{}, result:{}", JSON.toJSONString(orderBasicInfo), JSON.toJSONString(orderSettleResult)); // 余额支付的订单 只用余额支付转账 // orderSettleResult = doBalancePayment(orderBasicInfo, adapayMemberAccount); @@ -169,7 +169,7 @@ public class TempService { BigDecimal settleAmount = BigDecimal.ZERO; if (orderAmount.compareTo(BigDecimal.ZERO) > 0) { - if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { /* 余额支付 查询支付记录，如全部用本金支付，则虚拟金额为0，结算金额为订单消费金额， 如果使用了赠送金额，虚拟金额为赠送金额支付部分，结算金额=订单消费金额-虚拟金额消费部分 @@ -300,7 +300,7 @@ public class TempService { } // 分账金额为0，表示该订单没有执行过分账，再次执行分账 - if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // 余额支付的订单 orderBasicInfoService.doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, wechatAppId); } diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 2fda1f684..2f0009a88 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -2361,7 +2361,7 @@ public class SpringBootTestController { } dto.setChargeAmount(totalAccountAmount); // 充电金额 - dto.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); // 1-余额支付 + dto.setPayMode(OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()); // 1-余额支付 OrderBasicInfo basicInfo = orderBasicInfoService.generateOrder(dto); 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 d8747c70c..2fb47ba1e 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,7 +6,8 @@ package com.jsowell.common.enums.ykc; * 前端给的参数 */ public enum OrderPayModeEnum { - PAYMENT_OF_BALANCE("1", "余额支付"), + PAYMENT_OF_PRINCIPAL_BALANCE("1", "余额支付"), + PAYMENT_OF_GIFT_BALANCE("2", "赠金支付"), PAYMENT_OF_WHITELIST("3", "白名单支付"), PAYMENT_OF_WECHATPAY("4", "微信支付"), PAYMENT_OF_ALIPAY("5", "支付宝支付"), diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index a6463ffce..a7b324130 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -805,7 +805,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private void delayMerchantOrderRefundLogic(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) { try { String payMode = orderBasicInfo.getPayMode(); - if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付 balancePaymentOrderRefundV2(orderBasicInfo); } else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { @@ -833,7 +833,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private OrderSettleResult notDelayMerchantOrderRefundLogic(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) { try { String payMode = orderBasicInfo.getPayMode(); - if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付 balancePaymentOrderRefundV2(orderBasicInfo); } else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { @@ -1214,7 +1214,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { try { OrderSettleResult orderSettleResult; - if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // 余额支付的订单 orderSettleResult = doBalancePaymentWithDelay(orderBasicInfo, adapayMemberAccount, appId); } else { @@ -2455,7 +2455,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { if (accountBalance.compareTo(defaultAmount) > 0) { accountBalance = defaultAmount; } - payMode = OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue(); + payMode = OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue(); } dto.setChargeAmount(accountBalance); dto.setPayMode(payMode); @@ -3051,7 +3051,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR); // } // Map resultMap = Maps.newHashMap(); - // if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + // if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // // 余额支付 // // balancePayOrder(dto); // balancePayOrderV2(dto); @@ -3415,7 +3415,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // .scenarioType(ScenarioEnum.ORDER.getValue()) // .memberId(memberVO.getMemberId()) // .actionType(ActionTypeEnum.FORWARD.getValue()) - // .payMode(PayModeEnum.PAYMENT_OF_BALANCE.getValue()) + // .payMode(PayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()) // .paymentInstitutions(PaymentInstitutionsEnum.LOCAL_ACCOUNTS.getValue()) // .amount(dto.getPayAmount()) // 单位元 // .build(); @@ -3871,7 +3871,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { } List orderRefundInfoList = Lists.newArrayList(); OrderDetailInfoVO.OrderRefundInfo refundInfo; - if (OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + if (OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // 查新member_wallet_log订单 进账记录 List walletLogs = memberWalletLogService.getOrderRecord(orderBasicInfo.getOrderCode(), MemberWalletEnum.TYPE_IN.getValue()); if (CollectionUtils.isNotEmpty(walletLogs)) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index 2f5e2dcc6..be4f6456c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -127,12 +127,12 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue()) || StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) { // 使用余额支付 - orderPayRecordVO.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); + orderPayRecordVO.setPayMode(OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()); String payModeDesc = null; if (StringUtils.isNotBlank(OrderPayRecordEnum.getPayModeDesc(payMode))) { payModeDesc = OrderPayRecordEnum.getPayModeDesc(payMode); } else { - payModeDesc = OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue(); + payModeDesc = OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue(); } orderPayRecordVO.setPayModeDesc(payModeDesc); } else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())) { @@ -218,12 +218,12 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { if (StringUtils.equals(payMode, OrderPayRecordEnum.PRINCIPAL_BALANCE_PAYMENT.getValue()) || StringUtils.equals(payMode, OrderPayRecordEnum.GIFT_BALANCE_PAYMENT.getValue())) { // 使用余额支付 - payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue()); + payInfo.setPayMode(OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()); String payModeDesc = null; if (StringUtils.isNotBlank(OrderPayRecordEnum.getPayModeDesc(payMode))) { payModeDesc = OrderPayRecordEnum.getPayModeDesc(payMode); } else { - payModeDesc = OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue(); + payModeDesc = OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue(); } payInfo.setPayModeDesc(payModeDesc); } else if (StringUtils.equals(payMode, OrderPayRecordEnum.WECHATPAY_PAYMENT.getValue())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 3dbd24fc4..a025a19d6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -605,7 +605,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { } // 支付方式 Map resultMap = Maps.newHashMap(); - if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付占桩订单 balancePayOccupyPileOrder(dto); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index ac6305ba7..0416b06bc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -219,7 +219,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { // 虚拟金额 指订单消费中不参与结算的部分 BigDecimal virtualAmount = BigDecimal.ZERO; if (OrderPayModeEnum.PAYMENT_OF_WHITELIST.getValue().equals(orderBasicInfo.getPayMode()) - || OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { + || OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue().equals(orderBasicInfo.getPayMode())) { // 白名单支付所消费的金额，都属于虚拟金额，不参与结算对账 virtualAmount = new BigDecimal(orderAmount.toString()); } 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 98beccce2..36bec05d9 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 @@ -131,7 +131,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR); } Map resultMap = Maps.newHashMap(); - if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付 balancePayOrderV2(dto); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { @@ -262,7 +262,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { // .scenarioType(ScenarioEnum.ORDER.getValue()) // .memberId(memberVO.getMemberId()) // .actionType(ActionTypeEnum.FORWARD.getValue()) - // .payMode(PayModeEnum.PAYMENT_OF_BALANCE.getValue()) + // .payMode(PayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()) // .paymentInstitutions(PaymentInstitutionsEnum.LOCAL_ACCOUNTS.getValue()) // .amount(dto.getPayAmount()) // 单位元 // .build(); @@ -554,7 +554,7 @@ public class DelayMerchantProgramLogic extends AbstractProgramLogic { try { String payMode = orderBasicInfo.getPayMode(); - if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付 balancePaymentOrderRefund(orderBasicInfo); } else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 6a5f4e0bb..1dfbbeb66 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -92,7 +92,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { throw new BusinessException(ReturnCodeEnum.CODE_ORDER_IS_NOT_TO_BE_PAID_ERROR); } Map resultMap = Maps.newHashMap(); - if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付 balancePayOrderV2(dto); } else if (StringUtils.equals(dto.getPayMode(), OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { @@ -211,7 +211,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { // .scenarioType(ScenarioEnum.ORDER.getValue()) // .memberId(memberVO.getMemberId()) // .actionType(ActionTypeEnum.FORWARD.getValue()) - // .payMode(PayModeEnum.PAYMENT_OF_BALANCE.getValue()) + // .payMode(PayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue()) // .paymentInstitutions(PaymentInstitutionsEnum.LOCAL_ACCOUNTS.getValue()) // .amount(dto.getPayAmount()) // 单位元 // .build(); @@ -481,7 +481,7 @@ public class NotDelayMerchantProgramLogic extends AbstractProgramLogic { try { String payMode = orderBasicInfo.getPayMode(); - if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { + if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_PRINCIPAL_BALANCE.getValue())) { // 余额支付 balancePaymentOrderRefund(orderBasicInfo); } else if (StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {