From df44a7ae30727fc6decf470a991378ffb7c287d0 Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 25 Jun 2021 18:29:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8=E4=BD=99?= =?UTF-8?q?=E9=A2=9D=E6=94=AF=E4=BB=98=E8=BF=9B=E8=A1=8C=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/common/enums/ResultCode.java | 2 ++ .../order/trade/serviceimpl/RechargeServiceImpl.java | 2 -- .../modules/payment/kit/plugin/wallet/WalletPlugin.java | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 395cf364..bb92dd6f 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -228,6 +228,8 @@ public enum ResultCode { PAY_NOT_EXIST_ORDER(32011, "支付订单不存在"), + CAN_NOT_RECHARGE_WALLET(32012, "不能使用余额进行充值"), + /** * 售后 */ diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java index c0b8684a..dffa172a 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java @@ -62,8 +62,6 @@ public class RechargeServiceImpl extends ServiceImpl i queryWrapper.eq(!StringUtils.isEmpty(rechargeQueryVO.getRechargeSn()), "recharge_sn", rechargeQueryVO.getRechargeSn()); //会员id queryWrapper.eq(!StringUtils.isEmpty(rechargeQueryVO.getMemberId()), "member_id", rechargeQueryVO.getMemberId()); - //已付款的充值订单 - queryWrapper.eq("pay_status", PayStatusEnum.PAID.name()); //支付时间 开始时间和结束时间 if (!StringUtils.isEmpty(rechargeQueryVO.getStartDate()) && !StringUtils.isEmpty(rechargeQueryVO.getEndDate())) { Date start = cn.hutool.core.date.DateUtil.parse(rechargeQueryVO.getStartDate()); diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java index 6caca9ef..2f3a2749 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java @@ -1,9 +1,9 @@ package cn.lili.modules.payment.kit.plugin.wallet; import cn.lili.common.enums.ResultCode; +import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.context.UserContext; -import cn.lili.common.enums.ResultUtil; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.member.service.MemberWalletService; import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum; @@ -12,6 +12,7 @@ import cn.lili.modules.payment.kit.CashierSupport; import cn.lili.modules.payment.kit.Payment; import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; +import cn.lili.modules.payment.kit.enums.CashierEnum; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.service.PaymentService; @@ -68,6 +69,9 @@ public class WalletPlugin implements Payment { @Override public ResultMessage nativePay(HttpServletRequest request, PayParam payParam) { + if(payParam.getOrderType().equals(CashierEnum.RECHARGE.name())){ + throw new ServiceException(ResultCode.CAN_NOT_RECHARGE_WALLET); + } savePaymentLog(payParam); return ResultUtil.success(ResultCode.PAY_SUCCESS); }