dromara/dax-pay
1
0
Fork 0
mirror of https://gitee.com/dromara/dax-pay.git synced 2025-09-07 21:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat 钱包/储值卡/现金流水对接

Browse Source
This commit is contained in:
bootx
2024-02-18 23:37:11 +08:00
parent 2c8d9aa386
commit 0e31863e21
12 changed files with 67 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/cash/entity/CashRecord.java
View File

@@ -7,7 +7,6 @@ import cn.bootx.platform.daxpay.service.core.channel.cash.convert.CashPayConfigC
import cn.bootx.platform.daxpay.service.dto.channel.cash.CashRecordDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -23,11 +22,6 @@ import lombok.experimental.Accessors;
@DbTable(comment = "现金记录")
public class CashRecord extends MpCreateEntity implements EntityBaseFunction<CashRecordDto> {
/** 储值卡id */
@DbMySqlIndex(comment = "储值卡ID")
@DbColumn(comment = "储值卡id")
private Long voucherId;
/**
* 业务类型
* @see VoucherRecordTypeEnum
@@ -50,6 +44,10 @@ public class CashRecord extends MpCreateEntity implements EntityBaseFunction<Cas
@DbColumn(comment = "终端ip")
private String ip;
/** 备注 */
@DbColumn(comment = "备注")
private String remark;
/**
* 转换
*/

5
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/voucher/entity/VoucherRecord.java
View File

@@ -60,6 +60,11 @@ public class VoucherRecord extends MpCreateEntity implements EntityBaseFunction<
@DbColumn(comment = "终端ip")
private String ip;
/** 备注 */
@DbColumn(comment = "备注")
private String remark;
/**
* 转换
*/

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/convert/WalletConvert.java
View File

@@ -7,7 +7,7 @@ import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletRecord;
import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletConfigDto;
import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletDto;
import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletLogDto;
import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
import cn.bootx.platform.daxpay.service.param.channel.wechat.WalletConfigParam;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;

6
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/entity/WalletRecord.java
View File

@@ -4,7 +4,7 @@ import cn.bootx.platform.common.core.function.EntityBaseFunction;
import cn.bootx.platform.common.mybatisplus.base.MpCreateEntity;
import cn.bootx.platform.daxpay.service.code.WalletRecordTypeEnum;
import cn.bootx.platform.daxpay.service.core.channel.wallet.convert.WalletConvert;
import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
import cn.bootx.table.modify.annotation.DbColumn;
import cn.bootx.table.modify.annotation.DbTable;
import cn.bootx.table.modify.mysql.annotation.DbMySqlIndex;
@@ -60,6 +60,10 @@ public class WalletRecord extends MpCreateEntity implements EntityBaseFunction<W
@DbColumn(comment = "终端ip")
private String ip;
/** 备注 */
@DbColumn(comment = "备注")
private String remark;
/**
* 转换
*/

2
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/core/channel/wallet/service/WalletRecordService.java
View File

@@ -6,7 +6,7 @@ import cn.bootx.platform.common.core.rest.param.PageParam;
import cn.bootx.platform.common.mybatisplus.util.MpUtil;
import cn.bootx.platform.daxpay.service.core.channel.wallet.dao.WalletRecordManager;
import cn.bootx.platform.daxpay.service.core.channel.wallet.entity.WalletRecord;
import cn.bootx.platform.daxpay.service.dto.channel.wechat.WalletRecordDto;
import cn.bootx.platform.daxpay.service.dto.channel.wallet.WalletRecordDto;
import cn.bootx.platform.daxpay.service.param.channel.wallet.WalletRecordQuery;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;

28
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/cash/CashRecordDto.java
View File

@@ -1,6 +1,7 @@
package cn.bootx.platform.daxpay.service.dto.channel.cash;
import cn.bootx.platform.common.core.rest.dto.BaseDto;
import cn.bootx.platform.daxpay.service.code.VoucherRecordTypeEnum;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -16,4 +17,31 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@Schema(title = "现金记录")
public class CashRecordDto extends BaseDto {
/**
* 业务类型
* @see VoucherRecordTypeEnum
*/
@Schema(description = "业务类型")
private String type;
/** 金额 */
@Schema(description = "金额")
private Integer amount;
/**
* 交易订单号
* 支付订单/退款订单
*/
@Schema(description = "交易订单号")
private String orderId;
/** 终端ip */
@Schema(description = "终端ip")
private String ip;
/** 备注 */
@Schema(description = "备注")
private String remark;
}

19
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherPayOrderDto.java
View File

@@ -1,19 +0,0 @@
package cn.bootx.platform.daxpay.service.dto.channel.voucher;
import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @author xxm
* @since 2022/3/14
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@Schema(title = "储值卡支付记录")
public class VoucherPayOrderDto extends PayOrderDto {
}

4
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/voucher/VoucherRecordDto.java
View File

@@ -51,4 +51,8 @@ public class VoucherRecordDto extends BaseDto {
/** 终端ip */
@Schema(description = "终端ip")
private String ip;
/** 备注 */
@Schema(description = "备注")
private String remark;
}

26
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletPayOrderDto.java
View File

@@ -1,26 +0,0 @@
package cn.bootx.platform.daxpay.service.dto.channel.wallet;
import cn.bootx.platform.daxpay.service.dto.order.pay.PayOrderDto;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* @author xxm
* @since 2020/12/8
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Accessors(chain = true)
@Schema(title = "钱包支付记录")
public class WalletPayOrderDto extends PayOrderDto implements Serializable {
private static final long serialVersionUID = 8238920331255597223L;
@Schema(description = "钱包ID")
private Long walletId;
}

6
daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wechat/WalletRecordDto.java → daxpay-single/daxpay-single-service/src/main/java/cn/bootx/platform/daxpay/service/dto/channel/wallet/WalletRecordDto.java
View File

@@ -1,4 +1,4 @@
package cn.bootx.platform.daxpay.service.dto.channel.wechat;
package cn.bootx.platform.daxpay.service.dto.channel.wallet;
import cn.bootx.platform.common.core.rest.dto.BaseDto;
import cn.bootx.platform.daxpay.service.code.WalletRecordTypeEnum;
@@ -51,4 +51,8 @@ public class WalletRecordDto extends BaseDto {
/** 终端ip */
@Schema(description = "终端ip")
private String ip;
/** 备注 */
@Schema(description = "备注")
private String remark;
}