充值模块调整
This commit is contained in:
parent
b3850a58c5
commit
e3c546bdb2
@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.app.PayAppDO;
|
|||||||
import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
|
import cn.iocoder.yudao.module.pay.dal.dataobject.channel.PayChannelDO;
|
||||||
import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
|
import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
|
||||||
import com.baomidou.mybatisplus.annotation.KeySequence;
|
import com.baomidou.mybatisplus.annotation.KeySequence;
|
||||||
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
@ -29,6 +30,7 @@ public class PayOrderDO extends BaseDO {
|
|||||||
/**
|
/**
|
||||||
* 订单编号,数据库自增
|
* 订单编号,数据库自增
|
||||||
*/
|
*/
|
||||||
|
@TableId
|
||||||
private Long id;
|
private Long id;
|
||||||
/**
|
/**
|
||||||
* 应用编号
|
* 应用编号
|
||||||
|
@ -47,7 +47,7 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
|
|||||||
/**
|
/**
|
||||||
* TODO 芋艿:放到 payconfig
|
* TODO 芋艿:放到 payconfig
|
||||||
*/
|
*/
|
||||||
private static final Long WALLET_PAY_APP_ID = 8L;
|
private static final Long WALLET_PAY_APP_ID = 1L;
|
||||||
|
|
||||||
private static final String WALLET_RECHARGE_ORDER_SUBJECT = "钱包余额充值";
|
private static final String WALLET_RECHARGE_ORDER_SUBJECT = "钱包余额充值";
|
||||||
|
|
||||||
@ -84,7 +84,7 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
|
|||||||
// 2.1 创建支付单
|
// 2.1 创建支付单
|
||||||
Long payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO()
|
Long payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO()
|
||||||
.setAppId(WALLET_PAY_APP_ID).setUserIp(userIp)
|
.setAppId(WALLET_PAY_APP_ID).setUserIp(userIp)
|
||||||
.setMerchantOrderId(recharge.getId().toString()) // 业务的订单编号
|
.setMerchantOrderId(""+recharge.getId()) // 业务的订单编号
|
||||||
.setSubject(WALLET_RECHARGE_ORDER_SUBJECT).setBody("")
|
.setSubject(WALLET_RECHARGE_ORDER_SUBJECT).setBody("")
|
||||||
.setPrice(recharge.getPayPrice())
|
.setPrice(recharge.getPayPrice())
|
||||||
.setExpireTime(addTime(Duration.ofHours(2L)))); // TODO @芋艿:支付超时时间
|
.setExpireTime(addTime(Duration.ofHours(2L)))); // TODO @芋艿:支付超时时间
|
||||||
|
Loading…
Reference in New Issue
Block a user