style 分账包名修改

_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] 分账相关接口: 分账,完结,同步,查询

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;

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;

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;

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;

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;

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;

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;