From 87a431c316a45a58bb24fecb48d0b70d191e2378 Mon Sep 17 00:00:00 2001 From: DaxPay Date: Thu, 19 Dec 2024 20:28:51 +0800 Subject: [PATCH] =?UTF-8?q?style=20=E5=88=86=E8=B4=A6=E5=8C=85=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _doc/Task.md | 5 ++++- .../dao/{config => allocation}/AllocConfigManager.java | 2 +- .../dao/{config => allocation}/AllocConfigMapper.java | 2 +- .../service/result/allocation/receiver/AllocReceiverVo.java | 1 - .../service/service/allocation/AllocConfigService.java | 2 +- .../daxpay/service/service/allocation/AllocationService.java | 2 +- .../service/service/allocation/AllocationSyncService.java | 2 +- .../daxpay/service/service/order/pay/PayOrderService.java | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/{config => allocation}/AllocConfigManager.java (94%) rename daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/{config => allocation}/AllocConfigMapper.java (84%) diff --git a/_doc/Task.md b/_doc/Task.md index 43666ea0..ad2333b7 100644 --- a/_doc/Task.md +++ b/_doc/Task.md @@ -1,5 +1,5 @@ # 单商户 -## 3.0.1 功能优化 +## 3.0.0.bate4 功能优化和服务商支付 - [ ] 网关配套移动端开发 - [ ] 同步回调页 - [ ] 收银台功能优化 @@ -8,6 +8,9 @@ - [ ] 增加首页驾驶舱功能 - [ ] 商户应用要有类似删除的功能, 实现停用冻结, 但不影响数据的关联 - [ ] 同步接口优化, 返回同步完的数据 +- [ ] 服务商支付支持 + - [ ] 支付宝 + - [ ] 微信 ## 3.0.0.bate3: 分账 - [x] SDK接口 - [x] 分账相关接口: 分账,完结,同步,查询 diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/AllocConfigManager.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/AllocConfigManager.java similarity index 94% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/AllocConfigManager.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/AllocConfigManager.java index 33a533a3..c44cdd29 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/AllocConfigManager.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/AllocConfigManager.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.dao.config; +package org.dromara.daxpay.service.dao.allocation; import cn.bootx.platform.common.mybatisplus.impl.BaseManager; import lombok.RequiredArgsConstructor; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/AllocConfigMapper.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/AllocConfigMapper.java similarity index 84% rename from daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/AllocConfigMapper.java rename to daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/AllocConfigMapper.java index fb60cdf3..f79673af 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/config/AllocConfigMapper.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/dao/allocation/AllocConfigMapper.java @@ -1,4 +1,4 @@ -package org.dromara.daxpay.service.dao.config; +package org.dromara.daxpay.service.dao.allocation; import com.github.yulichang.base.MPJBaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/allocation/receiver/AllocReceiverVo.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/allocation/receiver/AllocReceiverVo.java index 25790e91..04158e32 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/allocation/receiver/AllocReceiverVo.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/result/allocation/receiver/AllocReceiverVo.java @@ -38,7 +38,6 @@ public class AllocReceiverVo extends MchAppResult { @Schema(description = "分账接收方类型") private String receiverType; - @Schema(description = "接收方账号") @SensitiveInfo private String receiverAccount; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocConfigService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocConfigService.java index 192d8948..1b0e12e2 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocConfigService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocConfigService.java @@ -7,7 +7,7 @@ import cn.hutool.core.bean.copier.CopyOptions; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.daxpay.service.convert.allocation.AllocConfigConvert; -import org.dromara.daxpay.service.dao.config.AllocConfigManager; +import org.dromara.daxpay.service.dao.allocation.AllocConfigManager; import org.dromara.daxpay.service.entity.allocation.AllocConfig; import org.dromara.daxpay.service.param.allocation.AllocConfigParam; import org.dromara.daxpay.service.result.allocation.AllocConfigResult; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java index c59db697..70b46c5a 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationService.java @@ -22,7 +22,7 @@ import org.dromara.daxpay.service.code.DaxPayCode; import org.dromara.daxpay.service.convert.allocation.AllocOrderConvert; import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager; import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager; -import org.dromara.daxpay.service.dao.config.AllocConfigManager; +import org.dromara.daxpay.service.dao.allocation.AllocConfigManager; import org.dromara.daxpay.service.entity.allocation.AllocConfig; import org.dromara.daxpay.service.entity.allocation.order.AllocAndDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java index 96c568f1..219d02be 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/allocation/AllocationSyncService.java @@ -18,7 +18,7 @@ import org.dromara.daxpay.service.code.DaxPayCode; import org.dromara.daxpay.service.common.local.PaymentContextLocal; import org.dromara.daxpay.service.dao.allocation.order.AllocDetailManager; import org.dromara.daxpay.service.dao.allocation.order.AllocOrderManager; -import org.dromara.daxpay.service.dao.config.AllocConfigManager; +import org.dromara.daxpay.service.dao.allocation.AllocConfigManager; import org.dromara.daxpay.service.entity.allocation.AllocConfig; import org.dromara.daxpay.service.entity.allocation.order.AllocDetail; import org.dromara.daxpay.service.entity.allocation.order.AllocOrder; diff --git a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java index 0dc49489..c0baee63 100644 --- a/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java +++ b/daxpay-single/daxpay-single-service/src/main/java/org/dromara/daxpay/service/service/order/pay/PayOrderService.java @@ -7,7 +7,7 @@ import org.dromara.daxpay.core.exception.DataErrorException; import org.dromara.daxpay.core.exception.TradeNotExistException; import org.dromara.daxpay.core.param.allocation.order.AllocationParam; import org.dromara.daxpay.core.util.TradeNoGenerateUtil; -import org.dromara.daxpay.service.dao.config.AllocConfigManager; +import org.dromara.daxpay.service.dao.allocation.AllocConfigManager; import org.dromara.daxpay.service.dao.order.pay.PayOrderManager; import org.dromara.daxpay.service.entity.allocation.AllocConfig; import org.dromara.daxpay.service.entity.order.pay.PayOrder;