From 5f0fee09179d0020587949ac04f7da76add7632a Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 31 Mar 2025 19:04:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/order/HardOrderController.java | 20 +++++++++++++++ .../wallet/api/utils/WalletDataUtil.java | 1 + .../pjcloud/wallet/api/vo/MchManageVo.java | 9 +++++-- .../pjcloud/wallet/api/vo/WalletActiveVo.java | 2 ++ .../pjcloud/wallet/api/vo/WalletManageVo.java | 2 ++ .../api/vo/base/BaseWalletTypeInterface.java | 4 +++ .../vo/recharge/WalletRechargeApplyVo.java | 2 ++ .../vo/recharge/WalletRechargeImportVo.java | 2 ++ .../vo/transaction/WalletTransactionVo.java | 2 ++ .../controller/WalletManageController.java | 7 ++++++ .../wallet/service/WalletManageService.java | 25 ------------------- .../service/impl/WalletManageServiceImpl.java | 2 +- .../impl/rule/WalletRuleJoinServiceImpl.java | 1 + 13 files changed, 51 insertions(+), 28 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java index c06b25735..5f06576de 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java @@ -100,6 +100,26 @@ public class HardOrderController { return R.ok(hardwareOrderService.pagejoin(page, dto)); } + @Operation(summary = "app查询超市订单列表", description = "app查询订单列表") + @GetMapping("/app/sup-page-join") + public R appSupPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); + dto.setIsFindCarList(true); + dto.setMchTypeCodes(List.of(MerchantTypeEnum.SUPERMARKET.getType(), MerchantTypeEnum.SELF_SUPERMARKET.getType())); + return R.ok(hardwareOrderService.pagejoin(page, dto)); + } + + @Operation(summary = "app查询食堂订单列表", description = "app查询订单列表") + @GetMapping("/app/caneen-page-join") + public R appCaneenPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); + dto.setIsFindCarList(true); + dto.setMchTypeCodes(List.of(MerchantTypeEnum.CANTEEN.getType())); + return R.ok(hardwareOrderService.pagejoin(page, dto)); + } + @Operation(summary = "app商户查询订单列表", description = "app商户查询订单列表") @GetMapping("/app/mch-page-join") public R appMchPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) { diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/utils/WalletDataUtil.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/utils/WalletDataUtil.java index 59f17bb2d..dce22c0cc 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/utils/WalletDataUtil.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/utils/WalletDataUtil.java @@ -37,6 +37,7 @@ public class WalletDataUtil { v.setWalletTypeName(vo.getName()); v.setWalletTypeUniqueCode(vo.getUniqueCode()); v.setWalletTypeIcon(vo.getIcon()); + v.setIsRule(vo.getIsRule()); return v; } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/MchManageVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/MchManageVo.java index a963ff646..1cd54e0c5 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/MchManageVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/MchManageVo.java @@ -10,8 +10,9 @@ import java.util.List; @Data public class MchManageVo extends MchManageEntity implements BaseDeptInterface, BaseWalletTypeInterface { - private String deptName; - + /** + * 钱包类型相关 + */ private Long walletTypeId; private String walletTypeName; @@ -20,6 +21,10 @@ public class MchManageVo extends MchManageEntity implements BaseDeptInterface, B private String walletTypeIcon; + private String isRule; + + private String deptName; + private List children; } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletActiveVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletActiveVo.java index 6bc7a3df4..45615fecd 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletActiveVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletActiveVo.java @@ -41,4 +41,6 @@ public class WalletActiveVo extends WalletActiveEntity implements BaseUserInterf private String walletTypeUniqueCode; private String walletTypeIcon; + + private String isRule; } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletManageVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletManageVo.java index 8a9ef7216..4ea23cc72 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletManageVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/WalletManageVo.java @@ -24,6 +24,8 @@ public class WalletManageVo extends WalletManageEntity implements BaseUserInterf private String walletTypeIcon; + private String isRule; + /** * 用户相关 */ diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/base/BaseWalletTypeInterface.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/base/BaseWalletTypeInterface.java index 8c2ff646b..9efc401fd 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/base/BaseWalletTypeInterface.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/base/BaseWalletTypeInterface.java @@ -17,4 +17,8 @@ public interface BaseWalletTypeInterface { String getWalletTypeIcon(); void setWalletTypeIcon(String walletTypeIcon); + + String getIsRule(); + + void setIsRule(String isRule); } diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java index d8a5c8c77..929716217 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeApplyVo.java @@ -19,6 +19,8 @@ public class WalletRechargeApplyVo extends WalletRechargeApplyEntity implements private String walletTypeIcon; + private String isRule; + /** * 用户相关 */ diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java index 6a37a72f1..d864f22b7 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java @@ -57,6 +57,8 @@ public class WalletRechargeImportVo extends WalletRechargeImportEntity implement private String importTimeStr; + private String isRule; + /** * 导出相关 */ diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/transaction/WalletTransactionVo.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/transaction/WalletTransactionVo.java index 96b122b2a..64fea7535 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/transaction/WalletTransactionVo.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/transaction/WalletTransactionVo.java @@ -71,6 +71,8 @@ public class WalletTransactionVo extends WalletTransactionEntity implements Base private String walletTypeIcon; + private String isRule; + /** * 订单相关 */ diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java index 4d2ef56b3..3f204b3b8 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletManageController.java @@ -190,6 +190,13 @@ public class WalletManageController { return R.ok(walletManageService.getWallet(id)); } + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/join/{id}") + @PreAuthorize("@pms.hasPermission('wallet_walletManage_view')") + public R joinDetail(@PathVariable("id") Long id) { + return R.ok(walletManageService.join(null, id)); + } + @Operation(summary = "新增钱包管理", description = "新增钱包管理") @SysLog("新增钱包管理") @PostMapping diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java index f4976cf1c..038263a16 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletManageService.java @@ -17,67 +17,42 @@ public interface WalletManageService extends IService { /** * 创建钱包 - * - * @param userId - * @param checkPermission */ void createWallet(@NotNull Long userId, @NotNull Boolean checkPermission); /** * 创建钱包 - * - * @param userId */ void createWallet(@NotNull Long userId); /** * 获取钱包没有就创建用户钱包(没有缓存) - * - * @param userId */ WalletManageEntity getOrCreateWallet(@NotNull Long userId, @NotNull WalletTypeEnum walletTypeCode); /** * 获取钱包(没有缓存) - * - * @param userId - * @param walletTypeCode - * @return */ WalletManageEntity getWallet(@NotNull Long userId, @NotNull WalletTypeEnum walletTypeCode); - /** * 获取钱包(没有缓存) - * - * @param cardNumber - * @return */ WalletManageEntity getWallet(@NotNull String cardNumber); /** * 获取钱包(没有缓存) - * - * @param userId - * @param walletTypeId - * @return */ WalletManageEntity getWallet(@NotNull Long userId, @NotNull Long walletTypeId); /** * 获取钱包(有缓存) - * - * @param walletId - * @return */ WalletManageEntity getWallet(@NotNull Long walletId); /** * 根据用户id删除用户钱包 - * - * @param userIds - * @return */ Boolean delWalletByUserIds(List<@NotNull Long> userIds); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java index e90f18484..3773f3e85 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java @@ -254,7 +254,7 @@ public class WalletManageServiceImpl extends ServiceImpl list, WalletRuleJoinDto dto) { if (ObjectUtil.isEmpty(list)) return; // 部门 + list.forEach(v -> v.setDeptId(v.getTargetDeptId())); List deptIds = list.stream().map(WalletRuleJoinVo::getTargetDeptId).distinct().toList(); R> deptList = remoteDeptService.getDeptByDeptIds(deptIds); if (ObjectUtil.isNotEmpty(deptList.getData())) {