更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletModel.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/wallet/WalletModel.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment;
+package com.zhongshu.card.client.model.wallet;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.UserCountModel;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletParam.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/wallet/WalletParam.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment;
+package com.zhongshu.card.client.model.wallet;
 
 import com.zhongshu.card.client.model.base.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletRechargeModel.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/wallet/WalletRechargeModel.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment;
+package com.zhongshu.card.client.model.wallet;
 
 import com.zhongshu.card.client.model.base.SuperModel;
 import com.zhongshu.card.client.model.org.UserCountModel;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletRechargeParam.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/wallet/WalletRechargeParam.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment;
+package com.zhongshu.card.client.model.wallet;
 
 import com.zhongshu.card.client.model.base.SuperParam;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletRechargeSearch.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/wallet/WalletRechargeSearch.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment;
+package com.zhongshu.card.client.model.wallet;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
 import com.zhongshu.card.client.type.RechargeType;

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletSearch.java → FullCardClient/src/main/java/com/zhongshu/card/client/model/wallet/WalletSearch.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.client.model.payment;
+package com.zhongshu.card.client.model.wallet;
 
 import com.zhongshu.card.client.model.base.SuperSearch;
 import io.swagger.v3.oas.annotations.media.Schema;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/paySetting/ProjectPaySettingController.java

@@ -34,6 +34,13 @@ public class ProjectPaySettingController {
     @Autowired
     private ProjectPaySettingServiceImpl projectPaySettingService;
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "得到项目所有的支付渠道参数配置", description = "得到项目所有的支付渠道参数配置")
+    @RequestMapping(value = "getAllProjectPaySetting", method = {RequestMethod.POST})
+    public ResultContent<List<ProjectPaySettingModel>> getAllProjectPaySetting(@RequestBody ProjectOidParam param) {
+        return projectPaySettingService.getAllProjectPaySetting(param.getProjectOid());
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "保存项目的微信支付设置", description = "保存项目的微信支付设置")
     @RequestMapping(value = "saveWxPayConfig", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = {RequestMethod.POST})
@@ -62,13 +69,6 @@ public class ProjectPaySettingController {
         return projectPaySettingService.getLaKaLaConfig(param.getProjectOid());
     }
 
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "得到项目所有的支付渠道参数配置", description = "得到项目所有的支付渠道参数配置")
-    @RequestMapping(value = "getAllProjectPaySetting", method = {RequestMethod.POST})
-    public ResultContent<List<ProjectPaySettingModel>> getAllProjectPaySetting(@RequestBody ProjectOidParam param) {
-        return projectPaySettingService.getAllProjectPaySetting(param.getProjectOid());
-    }
-
     @ResourceAuth(value = "user", type = AuthType.User)
     @Operation(summary = "删除参数配置", description = "删除参数配置")
     @RequestMapping(value = "deleteInfo", method = {RequestMethod.POST})

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/payment/WalletController.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/wallet/WalletController.java

@@ -1,16 +1,16 @@
-package com.zhongshu.card.server.core.controller.payment;
+package com.zhongshu.card.server.core.controller.wallet;
 
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.zhongshu.card.client.model.base.IDParam;
-import com.zhongshu.card.client.model.payment.WalletModel;
-import com.zhongshu.card.client.model.payment.WalletRechargeModel;
-import com.zhongshu.card.client.model.payment.WalletRechargeParam;
-import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
+import com.zhongshu.card.client.model.wallet.WalletModel;
+import com.zhongshu.card.client.model.wallet.WalletRechargeModel;
+import com.zhongshu.card.client.model.wallet.WalletRechargeParam;
+import com.zhongshu.card.client.model.wallet.WalletRechargeSearch;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.server.core.domain.payment.Wallet;
-import com.zhongshu.card.server.core.service.payment.WalletService;
+import com.zhongshu.card.server.core.domain.wallet.Wallet;
+import com.zhongshu.card.server.core.service.wallet.WalletService;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/WalletDao.java

@@ -1,15 +0,0 @@
-package com.zhongshu.card.server.core.dao.payment;
-
-import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.card.server.core.dao.payment.extend.ComplexDaoExtend;
-import com.zhongshu.card.server.core.domain.payment.Complex;
-import com.zhongshu.card.server.core.domain.payment.Wallet;
-
-import java.util.List;
-
-public interface WalletDao extends MongoDao<Wallet> {
-
-    // 根据用户ID查询钱包信息
-    Wallet findByUserId(String userId);
-
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/extend/WalletRechargeExtend.java

@@ -1,17 +0,0 @@
-package com.zhongshu.card.server.core.dao.payment.extend;
-
-import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
-import com.zhongshu.card.client.model.school.BookInfoSearch;
-import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
-import com.zhongshu.card.server.core.domain.school.BookInfo;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-
-/**
- * @Author TRX
- * @CreateDate: 2023/7/7
- * @Version: 1.0
- */
-public interface WalletRechargeExtend {
-    Page<WalletRecharge> page(Pageable pageable, WalletRechargeSearch param);
-}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/wallet/WalletDao.java

@@ -0,0 +1,11 @@
+package com.zhongshu.card.server.core.dao.wallet;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.server.core.domain.wallet.Wallet;
+
+public interface WalletDao extends MongoDao<Wallet> {
+
+    // 根据用户ID查询钱包信息
+    Wallet findByUserId(String userId);
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/WalletRechargeDao.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/wallet/WalletRechargeDao.java

@@ -1,8 +1,8 @@
-package com.zhongshu.card.server.core.dao.payment;
+package com.zhongshu.card.server.core.dao.wallet;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
-import com.zhongshu.card.server.core.dao.payment.extend.WalletRechargeExtend;
-import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
+import com.zhongshu.card.server.core.dao.wallet.extend.WalletRechargeExtend;
+import com.zhongshu.card.server.core.domain.wallet.WalletRecharge;
 
 public interface WalletRechargeDao extends MongoDao<WalletRecharge>, WalletRechargeExtend {
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/wallet/extend/WalletRechargeExtend.java

@@ -0,0 +1,15 @@
+package com.zhongshu.card.server.core.dao.wallet.extend;
+
+import com.zhongshu.card.client.model.wallet.WalletRechargeSearch;
+import com.zhongshu.card.server.core.domain.wallet.WalletRecharge;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * @Author TRX
+ * @CreateDate: 2023/7/7
+ * @Version: 1.0
+ */
+public interface WalletRechargeExtend {
+    Page<WalletRecharge> page(Pageable pageable, WalletRechargeSearch param);
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/WalletRechargeDaoImpl.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/wallet/impl/WalletRechargeDaoImpl.java

@@ -1,10 +1,10 @@
-package com.zhongshu.card.server.core.dao.payment.impl;
+package com.zhongshu.card.server.core.dao.wallet.impl;
 
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
-import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
+import com.zhongshu.card.client.model.wallet.WalletRechargeSearch;
 import com.zhongshu.card.server.core.dao.BaseImpl;
-import com.zhongshu.card.server.core.dao.payment.extend.WalletRechargeExtend;
-import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
+import com.zhongshu.card.server.core.dao.wallet.extend.WalletRechargeExtend;
+import com.zhongshu.card.server.core.domain.wallet.WalletRecharge;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/Wallet.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/wallet/Wallet.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.domain.payment;
+package com.zhongshu.card.server.core.domain.wallet;
 
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/WalletRecharge.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/wallet/WalletRecharge.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.domain.payment;
+package com.zhongshu.card.server.core.domain.wallet;
 
 import com.zhongshu.card.client.type.RechargeType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -31,8 +31,6 @@ import com.zhongshu.card.client.utils.DateUtils;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
 import com.zhongshu.card.server.core.dao.projectAbout.ProjectPaySettingDao;
-import com.zhongshu.card.server.core.dao.payment.WalletDao;
-import com.zhongshu.card.server.core.dao.payment.WalletRechargeDao;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
 import com.zhongshu.card.server.core.dao.devices.DeviceBindDao;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
@@ -84,15 +82,6 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     @Autowired
     UserCountDao userCountDao;
 
-    @Autowired
-    WalletDao walletDao;
-
-    @Autowired
-    WalletService walletService;
-
-    @Autowired
-    WalletRechargeDao walletRechargeDao;
-
     @Autowired
     DeviceInfoDao deviceInfoDao;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/WalletService.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/service/wallet/WalletService.java

@@ -1,20 +1,20 @@
-package com.zhongshu.card.server.core.service.payment;
+package com.zhongshu.card.server.core.service.wallet;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.zhongshu.card.client.model.org.UserCountModel;
-import com.zhongshu.card.client.model.payment.WalletModel;
-import com.zhongshu.card.client.model.payment.WalletRechargeModel;
-import com.zhongshu.card.client.model.payment.WalletRechargeParam;
-import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
+import com.zhongshu.card.client.model.wallet.WalletModel;
+import com.zhongshu.card.client.model.wallet.WalletRechargeModel;
+import com.zhongshu.card.client.model.wallet.WalletRechargeParam;
+import com.zhongshu.card.client.model.wallet.WalletRechargeSearch;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.RechargeType;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
-import com.zhongshu.card.server.core.dao.payment.WalletDao;
-import com.zhongshu.card.server.core.dao.payment.WalletRechargeDao;
+import com.zhongshu.card.server.core.dao.wallet.WalletDao;
+import com.zhongshu.card.server.core.dao.wallet.WalletRechargeDao;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
-import com.zhongshu.card.server.core.domain.payment.Wallet;
-import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
+import com.zhongshu.card.server.core.domain.wallet.Wallet;
+import com.zhongshu.card.server.core.domain.wallet.WalletRecharge;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;