From 7758a9596010163f806c36c4c830022becb2ab1f Mon Sep 17 00:00:00 2001 From: xxm Date: Tue, 25 Jul 2023 22:55:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E9=92=B1=E5=8C=85=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=BC=80=E9=80=9A=E6=94=AF=E6=8C=81=E5=A4=9A=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=92=8C=E5=A4=9A=E5=BA=94=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 8 +++++++- .../daxpay/core/channel/wallet/dao/WalletManager.java | 3 +-- .../daxpay/core/channel/wallet/service/WalletService.java | 2 ++ .../platform/daxpay/dto/channel/wallet/WalletDto.java | 6 ++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/_doc/Task.md b/_doc/Task.md index 73da38ae6..0dbdfe8b2 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -12,7 +12,13 @@ 1.0.2 - 微信V3支付接口 - 支付超时逻辑重构 +- 各种子支付单记录商户号和应用号等信息, 后期进行统计时使用 +- 增加手续费配置管理 +- 各种支付方式配置可以记录手续费比例, 支持简易模式和关联支付配置模式 - 储值卡支持多卡合一 - 储值卡信息调整 - 删除应用或商户是做校验, 级联删除对应的支付配置 -- 商户关联用户 +- 用户体系调整 + - 拆分出来用户和顾客 +- 增加可同时用于多商户的钱包 +- 增加类似京东E卡的支付工具 diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java index 153441cb2..10cfc89d1 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/dao/WalletManager.java @@ -137,8 +137,7 @@ public class WalletManager extends BaseManager { public Page pageByNotWallet(PageParam pageParam, String mchCode, UserInfoParam userInfoParam) { Page mpPage = MpUtil.getMpPage(pageParam, UserInfo.class); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.isNull("w.id") - .orderByDesc("w.id") + wrapper.orderByDesc("w.id") .and(o->o.ne("w.mch_code",mchCode).or().isNull("w.mch_code")) .like(StrUtil.isNotBlank(userInfoParam.getUsername()), "u.username", userInfoParam.getUsername()) .like(StrUtil.isNotBlank(userInfoParam.getName()), "u.name", userInfoParam.getName()); diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java index f7459568c..e566759e4 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/core/channel/wallet/service/WalletService.java @@ -61,6 +61,8 @@ public class WalletService { } Wallet wallet = new Wallet().setUserId(userId) .setBalance(defaultBalance) + .setMchCode(mchCode) + .setMchAppCode(mchAppCode) .setFreezeBalance(BigDecimal.ZERO) .setStatus(WalletCode.STATUS_NORMAL); walletManager.save(wallet); diff --git a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java index 313eb66e4..627ba9315 100644 --- a/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java +++ b/dax-pay/src/main/java/cn/bootx/platform/daxpay/dto/channel/wallet/WalletDto.java @@ -27,6 +27,12 @@ public class WalletDto extends BaseDto implements Serializable { @Schema(description = "钱包关联的账号ID") private Long userId; + @Schema(description = "商户编码") + private String mchCode; + + @Schema(description = "商户应用编码") + private String mchAppCode; + @Schema(description = "钱包余额") private BigDecimal balance;