caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

不能使用余额支付进行充值

Browse Source
This commit is contained in:
Chopper 2021-06-25 18:29:58 +08:00
parent 0d6d92139b
commit df44a7ae30
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/common/enums/ResultCode.java
View File

@ -228,6 +228,8 @@ public enum ResultCode {
PAY_NOT_EXIST_ORDER(32011, "支付订单不存在"), PAY_NOT_EXIST_ORDER(32011, "支付订单不存在"),
CAN_NOT_RECHARGE_WALLET(32012, "不能使用余额进行充值"),
/** /**
* 售后 * 售后
*/ */

2
framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java
View File

@ -62,8 +62,6 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
queryWrapper.eq(!StringUtils.isEmpty(rechargeQueryVO.getRechargeSn()), "recharge_sn", rechargeQueryVO.getRechargeSn()); queryWrapper.eq(!StringUtils.isEmpty(rechargeQueryVO.getRechargeSn()), "recharge_sn", rechargeQueryVO.getRechargeSn());
//会员id //会员id
queryWrapper.eq(!StringUtils.isEmpty(rechargeQueryVO.getMemberId()), "member_id", rechargeQueryVO.getMemberId()); 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())) { if (!StringUtils.isEmpty(rechargeQueryVO.getStartDate()) && !StringUtils.isEmpty(rechargeQueryVO.getEndDate())) {
Date start = cn.hutool.core.date.DateUtil.parse(rechargeQueryVO.getStartDate()); Date start = cn.hutool.core.date.DateUtil.parse(rechargeQueryVO.getStartDate());

6
framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java
View File

@ -1,9 +1,9 @@
package cn.lili.modules.payment.kit.plugin.wallet; package cn.lili.modules.payment.kit.plugin.wallet;
import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultCode;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext; import cn.lili.common.security.context.UserContext;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage; import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.member.service.MemberWalletService; import cn.lili.modules.member.service.MemberWalletService;
import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum; 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.Payment;
import cn.lili.modules.payment.kit.dto.PayParam; import cn.lili.modules.payment.kit.dto.PayParam;
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams; 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.enums.PaymentMethodEnum;
import cn.lili.modules.payment.kit.params.dto.CashierParam; import cn.lili.modules.payment.kit.params.dto.CashierParam;
import cn.lili.modules.payment.service.PaymentService; import cn.lili.modules.payment.service.PaymentService;
@ -68,6 +69,9 @@ public class WalletPlugin implements Payment {
@Override @Override
public ResultMessage<Object> nativePay(HttpServletRequest request, PayParam payParam) { public ResultMessage<Object> nativePay(HttpServletRequest request, PayParam payParam) {
if(payParam.getOrderType().equals(CashierEnum.RECHARGE.name())){
throw new ServiceException(ResultCode.CAN_NOT_RECHARGE_WALLET);
}
savePaymentLog(payParam); savePaymentLog(payParam);
return ResultUtil.success(ResultCode.PAY_SUCCESS); return ResultUtil.success(ResultCode.PAY_SUCCESS);
} }