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) {