From 03ca7f079fa1f7fa19fc34313111cfd71c6b3e17 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 23 May 2025 12:38:39 +0800 Subject: [PATCH 1/2] 11 --- .../pjcloud/wallet/controller/WalletCodeUseController.java | 6 +++++- .../pjcloud/wallet/controller/WalletForeignController.java | 2 +- .../pjcloud/wallet/controller/WalletStrideController.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletCodeUseController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletCodeUseController.java index 8cabfb93f..c0ef1047b 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletCodeUseController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletCodeUseController.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.security.annotation.Inner; +import com.bsd.pjcloud.common.security.service.PjcloudUser; +import com.bsd.pjcloud.common.security.util.SecurityUtils; import com.bsd.pjcloud.wallet.api.constant.WalletCodeBizEnum; import com.bsd.pjcloud.wallet.api.dto.WalletCodeUseDto; import com.bsd.pjcloud.wallet.api.entity.WalletCodeUseEntity; @@ -86,9 +88,11 @@ public class WalletCodeUseController { /* ************************************* end 远程调用 end ************************************* */ /* ************************************* start app start ************************************* */ - @Operation(summary = "app二维码列表", description = "app二维码列表") + @Operation(summary = "app二维码列表(查询自己的用户)", description = "app二维码列表(查询自己的用户)") @GetMapping("/app/code-list") public R appCodeList(@ParameterObject Page page, @ParameterObject WalletCodeUseDto dto) { + PjcloudUser user = SecurityUtils.getUser(); + dto.setUserId(user.getId()); return R.ok(walletCodeUseService.pageJoin(page, dto)); } /* ************************************* end app end ************************************* */ diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletForeignController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletForeignController.java index 34226c917..3f7bfdd9a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletForeignController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletForeignController.java @@ -74,7 +74,7 @@ public class WalletForeignController { @Operation(summary = "app申请外来人员电子餐券表", description = "app申请外来人员电子餐券表") @SysLog("app申请外来人员电子餐券") @PostMapping("/app/apply") - @Idempotent(expireTime = 10, info = "正在申请中，请勿重复操作") + @Idempotent(expireTime = 3, info = "正在申请中，请勿重复操作") public R appSave(@RequestBody WalletForeignDto dto) { PjcloudUser loginUser = SecurityUtils.getUser(); dto.setUserId(loginUser.getId()); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletStrideController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletStrideController.java index 300f38869..77feb45b1 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletStrideController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletStrideController.java @@ -70,7 +70,7 @@ public class WalletStrideController { @Operation(summary = "app申请", description = "app申请") @SysLog("app申请跨单位就餐") @PostMapping("/app/apply") - @Idempotent(expireTime = 10, info = "正在申请中，请勿重复操作") + @Idempotent(expireTime = 3, info = "正在申请中，请勿重复操作") public R appSave(@RequestBody WalletStrideDto dto) { PjcloudUser loginUser = SecurityUtils.getUser(); dto.setUserId(loginUser.getId()); From 8314f51dc5cce191cebfe9a82f5343f2d6e912aa Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 23 May 2025 14:54:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/service/impl/spu/HardSpuServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java index d1bb409bf..69b04f9fd 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/spu/HardSpuServiceImpl.java @@ -113,10 +113,10 @@ public class HardSpuServiceImpl extends ServiceImpl picList = Arrays.asList(pic.split(",")); String imageBaseUrl = ParamResolver.getStr("IMAGE_BASE_URL"); if (ObjectUtil.isEmpty(imageBaseUrl)) throw new RuntimeException("请配置图片基础路径"); @@ -509,7 +509,7 @@ public class HardSpuServiceImpl extends ServiceImpl picList = Arrays.asList(pic.split(",")); String imageBaseUrl = ParamResolver.getStr("IMAGE_BASE_URL"); if (ObjectUtil.isEmpty(imageBaseUrl)) throw new RuntimeException("请配置图片基础路径");