From 05d3dcd6ce00736d2e3b8728cb4aac8b42fe2fec Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 7 Mar 2025 17:16:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 13 ++-- .../WalletTransactionController.java | 3 +- .../controller/WalletTypeController.java | 63 ++++++++++++------- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index d75b6bcc3..1abb10c07 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -44,19 +44,20 @@ oauth2: # 正元智慧 # https://gwyc.zj.gov.cn/API/%E7%9C%81%E5%B9%B3%E5%8F%B0API%E5%AF%B9%E6%8E%A5%E6%8E%A5%E5%8F%A3.html zy: - # base-url: http://60.191.37.212:18079 # 测试1 - # app-id: 689C8D6F5059A6F85B8BE45A49001ACB - # app-secret: BD21DA0DEB8F0FC43246B0BD2FCAE6FF + base-url: http://60.191.37.212:18079 + app-id: 689C8D6F5059A6F85B8BE45A49001ACB + app-secret: BD21DA0DEB8F0FC43246B0BD2FCAE6FF # 测试2 + # base-url: http://60.191.37.212:18079 # app-id: FC455B0A788E334AC08FB3E1D8385C75 # app-secret: E9131D0BCC9054808675DA1E2E199023 # 正式 - base-url: https://gwycport.zj.gov.cn - app-id: 0BBF0D9A7F1B4BD5280E59197E259AC6 - app-secret: 434752786ACBB37214F6617CC37AD0E9 + # base-url: https://gwycport.zj.gov.cn + # app-id: 0BBF0D9A7F1B4BD5280E59197E259AC6 + # app-secret: 434752786ACBB37214F6617CC37AD0E9 self-base-url: http://60.191.37.212:18079 diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java index f2524644a..83e021c26 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTransactionController.java @@ -120,7 +120,8 @@ public class WalletTransactionController { @Operation(summary = "分页查询复杂查询", description = "分页查询复杂查询") @GetMapping("/page-join") - @PreAuthorize("@pms.hasPermission('wallet_walletTransaction_view')") + // TODO 这个比较公用先不加权限 + // @PreAuthorize("@pms.hasPermission('wallet_walletTransaction_view')") public R getWalletTransactionPageJoin(@ParameterObject Page page, @ParameterObject WalletTransactionDto dto) { DataScope dataScope = new DataScope(); return R.ok(walletTransactionService.scopePageList(page, dto, dataScope)); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java index d8e5a71f6..fa6cefce0 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java @@ -30,50 +30,64 @@ import java.util.Objects; */ @RestController @RequiredArgsConstructor -@RequestMapping("/walletType" ) -@Tag(description = "walletType" , name = "钱包类型管理" ) +@RequestMapping("/walletType") +@Tag(description = "walletType", name = "钱包类型管理") @SecurityRequirement(name = HttpHeaders.AUTHORIZATION) public class WalletTypeController { - private final WalletTypeService walletTypeService; + private final WalletTypeService walletTypeService; /** * 分页查询 - * @param page 分页对象 + * + * @param page 分页对象 * @param walletType 钱包类型 * @return */ - @Operation(summary = "分页查询" , description = "分页查询" ) - @GetMapping("/page" ) - @PreAuthorize("@pms.hasPermission('wallet_walletType_view')" ) + @Operation(summary = "分页查询", description = "分页查询") + @GetMapping("/page") + @PreAuthorize("@pms.hasPermission('wallet_walletType_view')") public R getWalletTypePage(@ParameterObject Page page, @ParameterObject WalletTypeEntity walletType) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.orderByDesc(WalletTypeEntity::getCreateTime); return R.ok(walletTypeService.page(page, wrapper)); } + /** + * 查询下拉 + */ + @Operation(summary = "查询下拉", description = "查询下拉") + @GetMapping("/select") + public R> walletList() { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.orderByDesc(WalletTypeEntity::getCreateTime); + return R.ok(walletTypeService.list(wrapper)); + } + /** * 通过id查询钱包类型 + * * @param id id * @return R */ - @Operation(summary = "通过id查询" , description = "通过id查询" ) - @GetMapping("/{id}" ) - @PreAuthorize("@pms.hasPermission('wallet_walletType_view')" ) - public R getById(@PathVariable("id" ) Long id) { + @Operation(summary = "通过id查询", description = "通过id查询") + @GetMapping("/{id}") + @PreAuthorize("@pms.hasPermission('wallet_walletType_view')") + public R getById(@PathVariable("id") Long id) { return R.ok(walletTypeService.getById(id)); } /** * 新增钱包类型 + * * @param dto 钱包类型 * @return R */ - @Operation(summary = "新增钱包类型" , description = "新增钱包类型" ) - @SysLog("新增钱包类型" ) + @Operation(summary = "新增钱包类型", description = "新增钱包类型") + @SysLog("新增钱包类型") @PostMapping - @PreAuthorize("@pms.hasPermission('wallet_walletType_add')" ) + @PreAuthorize("@pms.hasPermission('wallet_walletType_add')") public R save(@RequestBody WalletTypeEntity dto) { walletTypeService.create(dto); return R.ok(true); @@ -81,13 +95,14 @@ public class WalletTypeController { /** * 修改钱包类型 + * * @param dto 钱包类型 * @return R */ - @Operation(summary = "修改钱包类型" , description = "修改钱包类型" ) - @SysLog("修改钱包类型" ) + @Operation(summary = "修改钱包类型", description = "修改钱包类型") + @SysLog("修改钱包类型") @PutMapping - @PreAuthorize("@pms.hasPermission('wallet_walletType_edit')" ) + @PreAuthorize("@pms.hasPermission('wallet_walletType_edit')") public R updateById(@RequestBody WalletTypeEntity dto) { walletTypeService.edit(dto); return R.ok(true); @@ -95,13 +110,14 @@ public class WalletTypeController { /** * 通过id删除钱包类型 + * * @param ids id列表 * @return R */ - @Operation(summary = "通过id删除钱包类型" , description = "通过id删除钱包类型" ) - @SysLog("通过id删除钱包类型" ) + @Operation(summary = "通过id删除钱包类型", description = "通过id删除钱包类型") + @SysLog("通过id删除钱包类型") @DeleteMapping - @PreAuthorize("@pms.hasPermission('wallet_walletType_del')" ) + @PreAuthorize("@pms.hasPermission('wallet_walletType_del')") public R removeById(@RequestBody Long[] ids) { return R.ok(walletTypeService.removeBatchByIds(CollUtil.toList(ids))); } @@ -109,14 +125,15 @@ public class WalletTypeController { /** * 导出excel 表格 + * * @param walletType 查询条件 - * @param ids 导出指定ID + * @param ids 导出指定ID * @return excel 文件流 */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('wallet_walletType_export')" ) - public List export(WalletTypeEntity walletType,Long[] ids) { + @PreAuthorize("@pms.hasPermission('wallet_walletType_export')") + public List export(WalletTypeEntity walletType, Long[] ids) { return walletTypeService.list(Wrappers.lambdaQuery(walletType).in(ArrayUtil.isNotEmpty(ids), WalletTypeEntity::getId, ids)); } } \ No newline at end of file From ee53eb1cc34306393ea4e16b758324115230d849 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sun, 9 Mar 2025 13:41:50 +0800 Subject: [PATCH 2/3] 1111 --- .../src/main/resources/application.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index 1abb10c07..7107ef446 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -45,9 +45,9 @@ oauth2: # https://gwyc.zj.gov.cn/API/%E7%9C%81%E5%B9%B3%E5%8F%B0API%E5%AF%B9%E6%8E%A5%E6%8E%A5%E5%8F%A3.html zy: # 测试1 - base-url: http://60.191.37.212:18079 - app-id: 689C8D6F5059A6F85B8BE45A49001ACB - app-secret: BD21DA0DEB8F0FC43246B0BD2FCAE6FF + # base-url: http://60.191.37.212:18079 + # app-id: 689C8D6F5059A6F85B8BE45A49001ACB + # app-secret: BD21DA0DEB8F0FC43246B0BD2FCAE6FF # 测试2 # base-url: http://60.191.37.212:18079 @@ -55,9 +55,9 @@ zy: # app-secret: E9131D0BCC9054808675DA1E2E199023 # 正式 - # base-url: https://gwycport.zj.gov.cn - # app-id: 0BBF0D9A7F1B4BD5280E59197E259AC6 - # app-secret: 434752786ACBB37214F6617CC37AD0E9 + base-url: https://gwycport.zj.gov.cn + app-id: 0BBF0D9A7F1B4BD5280E59197E259AC6 + app-secret: 434752786ACBB37214F6617CC37AD0E9 self-base-url: http://60.191.37.212:18079 From 4dd31f6734a31cade120e74d6bd34d82d2d15560 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Sun, 9 Mar 2025 18:33:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=92=B1=E5=8C=85=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=EF=BC=8C=E5=8F=96=E6=B6=88=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=AD=A3=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/service/impl/order/HardOrderServiceImpl.java | 3 ++- .../bsd/pjcloud/wallet/controller/WalletTypeController.java | 4 ++-- .../pjcloud/wallet/service/impl/MchManageServiceImpl.java | 6 +++--- .../wallet/service/impl/WalletManageServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java index 68865c76d..ecd33ecee 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java @@ -476,7 +476,8 @@ public class HardOrderServiceImpl extends ServiceImpl list = carList.stream().map(v -> { SupermarketSpuUpdateStockReqDTO.Item item = new SupermarketSpuUpdateStockReqDTO.Item(); item.setId(v.getProductId()); - item.setIncrCount(v.getProductCount() * base); + double weight = BigDecimal.valueOf(v.getProductCount()).multiply(BigDecimal.valueOf(base)).setScale(2, RoundingMode.HALF_UP).doubleValue(); + item.setIncrCount(weight); return item; }).toList(); dto.setItems(list); diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java index fa6cefce0..f5538a2af 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/WalletTypeController.java @@ -58,10 +58,10 @@ public class WalletTypeController { */ @Operation(summary = "查询下拉", description = "查询下拉") @GetMapping("/select") - public R> walletList() { + public R> walletList(@ParameterObject Page page) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.orderByDesc(WalletTypeEntity::getCreateTime); - return R.ok(walletTypeService.list(wrapper)); + return R.ok(walletTypeService.page(page, wrapper)); } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java index fd51c2e88..153f92bb6 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/MchManageServiceImpl.java @@ -95,7 +95,7 @@ public class MchManageServiceImpl extends ServiceImpl { redisTemplate.opsForValue().getAndDelete(CacheConstants.WALLET_MCH + v); - walletThirdZyService.syncAllMch(v, Boolean.TRUE); + // walletThirdZyService.syncAllMch(v, Boolean.TRUE); }); baseMapper.deleteByIds(list); } 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 0f46d5e66..c525ecbb2 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 @@ -434,7 +434,7 @@ public class WalletManageServiceImpl extends ServiceImpl list, WalletManageDto dto) {