diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayRecordManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayRecordManager.java new file mode 100644 index 00000000..8c7c7ecd --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayRecordManager.java @@ -0,0 +1,18 @@ +package cn.bootx.platform.daxpay.service.core.channel.alipay.dao; + +import cn.bootx.platform.common.mybatisplus.impl.BaseManager; +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayRecord; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +/** + * + * @author xxm + * @since 2024/2/19 + */ +@Slf4j +@Repository +@RequiredArgsConstructor +public class AliPayRecordManager extends BaseManager { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayRecordMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayRecordMapper.java new file mode 100644 index 00000000..39486ed2 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/dao/AliPayRecordMapper.java @@ -0,0 +1,14 @@ +package cn.bootx.platform.daxpay.service.core.channel.alipay.dao; + +import cn.bootx.platform.daxpay.service.core.channel.alipay.entity.AliPayRecord; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * @author xxm + * @since 2024/2/19 + */ +@Mapper +public interface AliPayRecordMapper extends BaseMapper { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayRecord.java new file mode 100644 index 00000000..f9f681cb --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/entity/AliPayRecord.java @@ -0,0 +1,31 @@ +package cn.bootx.platform.daxpay.service.core.channel.alipay.entity; + +import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; +import cn.bootx.table.modify.annotation.DbTable; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 支付宝流水记录 + * @author xxm + * @since 2024/2/19 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@Accessors(chain = true) +@DbTable(comment = "支付宝流水记录") +@TableName("pay_alipay_record") +public class AliPayRecord extends MpCreateEntity { + + /** 标题 */ + + /** 金额 */ + + /** 业务类型 */ + + /** 本地订单号 */ + + /** 网关订单号 */ +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayRecordService.java new file mode 100644 index 00000000..e53bc718 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/alipay/service/AliPayRecordService.java @@ -0,0 +1,17 @@ +package cn.bootx.platform.daxpay.service.core.channel.alipay.service; + + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 支付宝流水 + * @author xxm + * @since 2024/2/1+9 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class AliPayRecordService { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java index a51ad6d3..9d24de34 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java @@ -22,6 +22,10 @@ import lombok.experimental.Accessors; @DbTable(comment = "现金记录") public class CashRecord extends MpCreateEntity implements EntityBaseFunction { + /** 标题 */ + @DbColumn(comment = "标题") + private String title; + /** * 业务类型 * @see CashRecordTypeEnum diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/service/CashRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/service/CashRecordService.java index 8b9204d5..8ab42554 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/service/CashRecordService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/service/CashRecordService.java @@ -29,8 +29,9 @@ public class CashRecordService { /** * 支付保存 */ - public void pay(PayChannelOrder channelOrder){ + public void pay(PayChannelOrder channelOrder, String title){ CashRecord record = new CashRecord() + .setTitle(title) .setType(CashRecordTypeEnum.PAY.getCode()) .setAmount(channelOrder.getAmount()) .setOrderId(String.valueOf(channelOrder.getPaymentId())); @@ -40,8 +41,9 @@ public class CashRecordService { /** * 退款保存 */ - public void refund(PayRefundChannelOrder channelOrder){ + public void refund(PayRefundChannelOrder channelOrder, String title){ CashRecord record = new CashRecord() + .setTitle(title) .setType(CashRecordTypeEnum.REFUND.getCode()) .setAmount(channelOrder.getAmount()) .setOrderId(String.valueOf(channelOrder.getRefundId())); @@ -51,8 +53,9 @@ public class CashRecordService { /** * 支付关闭 */ - public void payClose(PayChannelOrder channelOrder){ + public void payClose(PayChannelOrder channelOrder, String title){ CashRecord record = new CashRecord() + .setTitle(title) .setType(CashRecordTypeEnum.CLOSE_PAY.getCode()) .setAmount(channelOrder.getAmount()) .setOrderId(String.valueOf(channelOrder.getPaymentId())); diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayOrderManager.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayRecordManager.java similarity index 78% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayOrderManager.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayRecordManager.java index 57d516f5..a253d9a0 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayOrderManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayRecordManager.java @@ -1,7 +1,7 @@ package cn.bootx.platform.daxpay.service.core.channel.union.dao; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; -import cn.bootx.platform.daxpay.service.core.channel.union.entity.UnionPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.union.entity.UnionPayRecord; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; @@ -13,6 +13,6 @@ import org.springframework.stereotype.Repository; @Slf4j @Repository @RequiredArgsConstructor -public class UnionPayOrderManager extends BaseManager { +public class UnionPayRecordManager extends BaseManager { } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayOrderMapper.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayRecordMapper.java similarity index 75% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayOrderMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayRecordMapper.java index 2964f09b..56b85581 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayOrderMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/dao/UnionPayRecordMapper.java @@ -1,6 +1,6 @@ package cn.bootx.platform.daxpay.service.core.channel.union.dao; -import cn.bootx.platform.daxpay.service.core.channel.union.entity.UnionPayOrder; +import cn.bootx.platform.daxpay.service.core.channel.union.entity.UnionPayRecord; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -9,6 +9,6 @@ import org.apache.ibatis.annotations.Mapper; * @since 2022/3/11 */ @Mapper -public interface UnionPayOrderMapper extends BaseMapper { +public interface UnionPayRecordMapper extends BaseMapper { } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayOrder.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayRecord.java similarity index 70% rename from daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayOrder.java rename to daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayRecord.java index 5fd0acba..d3295269 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayOrder.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/union/entity/UnionPayRecord.java @@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** - * 云闪付支付订单 + * 云闪付流水记录 * @author xxm - * @since 2022/3/11 + * @since 2024/2/19 */ @EqualsAndHashCode(callSuper = true) @Data -@DbTable(comment = "云闪付支付订单") +@DbTable(comment = "云闪付流水记录") @Accessors(chain = true) -@TableName("pay_union_pay_order") -public class UnionPayOrder extends BasePayOrder { +@TableName("pay_union_pay_record") +public class UnionPayRecord extends BasePayOrder { } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java index 2a692aa3..09ed64a8 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java @@ -30,6 +30,10 @@ public class VoucherRecord extends MpCreateEntity implements EntityBaseFunction< @DbColumn(comment = "储值卡id") private Long voucherId; + /** 标题 */ + @DbColumn(comment = "标题") + private String title; + /** * 业务类型 * @see VoucherRecordTypeEnum diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherRecordService.java index e3a32919..6e8ea0c1 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherRecordService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/service/VoucherRecordService.java @@ -31,6 +31,7 @@ public class VoucherRecordService { */ public void importVoucher(Voucher voucher){ VoucherRecord voucherRecord = new VoucherRecord() + .setTitle("导入储值卡") .setType(VoucherRecordTypeEnum.IMPORT.getCode()) .setAmount(voucher.getBalance()) .setNewAmount(voucher.getBalance()) @@ -43,8 +44,9 @@ public class VoucherRecordService { /** * 支付保存 */ - public void pay(PayChannelOrder channelOrder, Voucher voucher){ + public void pay(PayChannelOrder channelOrder, String title, Voucher voucher){ VoucherRecord voucherRecord = new VoucherRecord() + .setTitle(title) .setType(VoucherRecordTypeEnum.PAY.getCode()) .setAmount(channelOrder.getAmount()) .setNewAmount(voucher.getBalance()) @@ -57,8 +59,9 @@ public class VoucherRecordService { /** * 退款保存 */ - public void refund(PayRefundChannelOrder channelOrder, Voucher voucher){ + public void refund(PayRefundChannelOrder channelOrder, String title, Voucher voucher){ VoucherRecord voucherRecord = new VoucherRecord() + .setTitle(title) .setType(VoucherRecordTypeEnum.REFUND.getCode()) .setAmount(channelOrder.getAmount()) .setNewAmount(voucher.getBalance()) @@ -71,8 +74,9 @@ public class VoucherRecordService { /** * 支付关闭 */ - public void payClose(PayChannelOrder channelOrder, Voucher voucher){ + public void payClose(PayChannelOrder channelOrder, String title, Voucher voucher){ VoucherRecord voucherRecord = new VoucherRecord() + .setTitle(title) .setType(VoucherRecordTypeEnum.CLOSE_PAY.getCode()) .setAmount(channelOrder.getAmount()) .setNewAmount(voucher.getBalance()) diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java index 68ee81ac..d131fc62 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java @@ -30,6 +30,10 @@ public class WalletRecord extends MpCreateEntity implements EntityBaseFunction { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayRecord.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayRecord.java new file mode 100644 index 00000000..26c1e627 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/entity/WeChatPayRecord.java @@ -0,0 +1,21 @@ +package cn.bootx.platform.daxpay.service.core.channel.wechat.entity; + +import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity; +import cn.bootx.table.modify.annotation.DbTable; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 微信支付记录 + * @author xxm + * @since 2024/2/19 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@DbTable(comment = "微信支付记录") +@Accessors(chain = true) +@TableName("pay_wechat_pay_record") +public class WeChatPayRecord extends MpCreateEntity { +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayRecordService.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayRecordService.java new file mode 100644 index 00000000..b6c41f21 --- /dev/null +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wechat/service/WeChatPayRecordService.java @@ -0,0 +1,18 @@ +package cn.bootx.platform.daxpay.service.core.channel.wechat.service; + +import cn.bootx.platform.daxpay.service.core.channel.wechat.dao.WeChatPayRecordManager; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * + * @author xxm + * @since 2024/2/19 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class WeChatPayRecordService { + private final WeChatPayRecordManager weChatPayRecordManager; +} diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java index 9222bb1a..142041d5 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/CashPayCloseStrategy.java @@ -1,6 +1,7 @@ package cn.bootx.platform.daxpay.service.core.payment.close.strategy; import cn.bootx.platform.daxpay.code.PayChannelEnum; +import cn.bootx.platform.daxpay.service.core.channel.cash.service.CashRecordService; import cn.bootx.platform.daxpay.service.func.AbsPayCloseStrategy; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,6 +20,7 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT @Service @RequiredArgsConstructor public class CashPayCloseStrategy extends AbsPayCloseStrategy { + private final CashRecordService cashRecordService; @Override public PayChannelEnum getChannel() { @@ -26,9 +28,10 @@ public class CashPayCloseStrategy extends AbsPayCloseStrategy { } /** - * 关闭操作, 不需要进行处理 + * 关闭操作 */ @Override public void doCloseHandler() { + cashRecordService.payClose(this.getChannelOrder(),this.getOrder().getTitle()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java index da1e605a..d074b2a3 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/VoucherPayCloseStrategy.java @@ -55,6 +55,6 @@ public class VoucherPayCloseStrategy extends AbsPayCloseStrategy { @Override public void doCloseHandler() { voucherPayService.close(this.getChannelOrder()); - voucherRecordService.payClose(this.getChannelOrder(),this.voucher); + voucherRecordService.payClose(this.getChannelOrder(), this.getOrder().getTitle(), this.voucher); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java index b6d4fd24..bd2d8184 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/close/strategy/WalletPayCloseStrategy.java @@ -54,6 +54,6 @@ public class WalletPayCloseStrategy extends AbsPayCloseStrategy { @Override public void doCloseHandler() { walletPayService.close(this.getChannelOrder(),this.wallet); - walletRecordService.payClose(this.getChannelOrder(),this.wallet); + walletRecordService.payClose(this.getChannelOrder(), this.getOrder().getTitle(), this.wallet); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java index dc013b55..c8a13e04 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/CashPayStrategy.java @@ -51,7 +51,7 @@ public class CashPayStrategy extends AbsPayStrategy { */ @Override public void doPayHandler() { - cashRecordService.pay(this.getChannelOrder()); + cashRecordService.pay(this.getChannelOrder(),this.getOrder().getTitle()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java index b6b54fcb..18dd4a09 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/VoucherPayStrategy.java @@ -76,7 +76,7 @@ public class VoucherPayStrategy extends AbsPayStrategy { @Override public void doPayHandler() { voucherPayService.pay(this.getPayChannelParam().getAmount(), this.voucher); - voucherRecordService.pay(this.getChannelOrder(), this.voucher); + voucherRecordService.pay(this.getChannelOrder(), this.getOrder().getTitle(), this.voucher); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java index 247e3bfc..8b6dfe89 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/pay/strategy/WalletPayStrategy.java @@ -97,6 +97,6 @@ public class WalletPayStrategy extends AbsPayStrategy { @Override public void doPayHandler() { walletPayService.pay(getPayChannelParam().getAmount(), this.wallet); - walletRecordService.pay(this.getChannelOrder(), this.wallet); + walletRecordService.pay(this.getChannelOrder(), this.getOrder().getTitle(),this.wallet); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java index 44e86cc8..c45db025 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/CashPayRefundStrategy.java @@ -38,7 +38,7 @@ public class CashPayRefundStrategy extends AbsRefundStrategy { public void doRefundHandler() { // 不包含异步支付 if (!this.getPayOrder().isAsyncPay()){ - cashRecordService.refund(this.getRefundChannelOrder()); + cashRecordService.refund(this.getRefundChannelOrder(),this.getPayOrder().getTitle()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java index 3f3af044..365ee4d6 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/VoucherPayRefundStrategy.java @@ -66,7 +66,7 @@ public class VoucherPayRefundStrategy extends AbsRefundStrategy { // 不包含异步支付 if (!this.getPayOrder().isAsyncPay()){ voucherPayService.refund(this.getRefundChannelParam().getAmount(), this.voucher); - voucherRecordService.refund(this.getRefundChannelOrder(), this.voucher); + voucherRecordService.refund(this.getRefundChannelOrder(), this.getPayOrder().getTitle(), this.voucher); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java index b89e7793..b18ca800 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/refund/strategy/WalletPayRefundStrategy.java @@ -65,7 +65,7 @@ public class WalletPayRefundStrategy extends AbsRefundStrategy { // 不包含异步支付 if (!this.getPayOrder().isAsyncPay()){ walletPayService.refund(this.wallet, this.getRefundChannelParam().getAmount()); - walletRecordService.refund(this.getRefundChannelOrder(), this.wallet); + walletRecordService.refund(this.getRefundChannelOrder(), this.getPayOrder().getTitle(), this.wallet); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/CashPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/CashPayRepairStrategy.java index 6b043774..a0447549 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/CashPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/CashPayRepairStrategy.java @@ -37,6 +37,6 @@ public class CashPayRepairStrategy extends AbsPayRepairStrategy { @Override public void doCloseLocalHandler() { this.getChannelOrder().setStatus(PayStatusEnum.CLOSE.getCode()); - cashRecordService.payClose(this.getChannelOrder()); + cashRecordService.payClose(this.getChannelOrder(),this.getOrder().getTitle()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/VoucherPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/VoucherPayRepairStrategy.java index 2ee49d59..b0d0a5ac 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/VoucherPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/VoucherPayRepairStrategy.java @@ -60,7 +60,7 @@ public class VoucherPayRepairStrategy extends AbsPayRepairStrategy { @Override public void doCloseLocalHandler() { voucherPayService.close(this.getChannelOrder()); - voucherRecordService.payClose(this.getChannelOrder(), this.voucher); + voucherRecordService.payClose(this.getChannelOrder(), this.getOrder().getTitle(), this.voucher); this.getChannelOrder().setStatus(PayStatusEnum.CLOSE.getCode()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/WalletPayRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/WalletPayRepairStrategy.java index 667d99d3..a1ab135a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/WalletPayRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/pay/WalletPayRepairStrategy.java @@ -61,7 +61,7 @@ public class WalletPayRepairStrategy extends AbsPayRepairStrategy { @Override public void doCloseLocalHandler() { walletPayService.close(this.getChannelOrder(),this.wallet); - walletRecordService.payClose(this.getChannelOrder(),this.wallet); + walletRecordService.payClose(this.getChannelOrder(), this.getOrder().getTitle(), this.wallet); this.getChannelOrder().setStatus(PayStatusEnum.CLOSE.getCode()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/CashRefundRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/CashRefundRepairStrategy.java index 76f5be08..adc1bac6 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/CashRefundRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/CashRefundRepairStrategy.java @@ -35,6 +35,6 @@ public class CashRefundRepairStrategy extends AbsRefundRepairStrategy { */ @Override public void doSuccessHandler() { - cashRecordService.refund(this.getRefundChannelOrder()); + cashRecordService.refund(this.getRefundChannelOrder(),this.getPayOrder().getTitle()); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/VoucherRefundRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/VoucherRefundRepairStrategy.java index 8b2c4bc7..f88f689c 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/VoucherRefundRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/VoucherRefundRepairStrategy.java @@ -57,6 +57,6 @@ public class VoucherRefundRepairStrategy extends AbsRefundRepairStrategy { @Override public void doSuccessHandler() { voucherPayService.refund(this.getPayChannelOrder().getAmount(), this.voucher); - voucherRecordService.refund(this.getRefundChannelOrder(), this.voucher); + voucherRecordService.refund(this.getRefundChannelOrder(), this.getPayOrder().getTitle(), this.voucher); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/WalletRefundRepairStrategy.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/WalletRefundRepairStrategy.java index 4c6a3d33..05187171 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/WalletRefundRepairStrategy.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/payment/repair/strategy/refund/WalletRefundRepairStrategy.java @@ -77,6 +77,6 @@ public class WalletRefundRepairStrategy extends AbsRefundRepairStrategy { refundChannelOrder.setStatus(RefundStatusEnum.SUCCESS.getCode()); // 退款真正执行和保存 walletPayService.refund(this.wallet, this.getRefundChannelOrder().getAmount()); - walletRecordService.refund(this.getRefundChannelOrder(), this.wallet); + walletRecordService.refund(this.getRefundChannelOrder(), this.getPayOrder().getTitle(), this.wallet); } } diff --git a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java index 365385bc..3a78c040 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java +++ b/daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java @@ -22,6 +22,10 @@ public class WalletRecordDto extends BaseDto { @Schema(description = "钱包id") private Long walletId; + /** 标题 */ + @Schema(description = "标题") + private String title; + /** * 业务类型 * @see WalletRecordTypeEnum