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] =?UTF-8?q?=E9=92=B1=E5=8C=85=E7=B1=BB=E5=9E=8B=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=EF=BC=8C=E5=8F=96=E6=B6=88=E5=AE=9E=E6=97=B6=E6=9B=B4?=
 =?UTF-8?q?=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<HardOrderMapper, HardOrder
             List<SupermarketSpuUpdateStockReqDTO.Item> 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<List<WalletTypeEntity>> walletList() {
+    public R<Page<WalletTypeEntity>> walletList(@ParameterObject Page page) {
         LambdaQueryWrapper<WalletTypeEntity> 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<MchManageMapper, MchManage
             e.printStackTrace();
             log.error("|{}|新增商户,生成收款码错误dto:|{}|error:|{}|", TAG, JSON.toJSONString(dto), e.getMessage());
         }
-        walletThirdZyService.syncAllMch(dto.getId(), Boolean.FALSE);
+        // walletThirdZyService.syncAllMch(dto.getId(), Boolean.FALSE);
         return dto.getId();
     }
 
@@ -113,7 +113,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
             throw new RuntimeException("商户不存在");
         }
         baseMapper.updateById(dto);
-        walletThirdZyService.syncAllMch(dto.getId(), Boolean.FALSE);
+        // walletThirdZyService.syncAllMch(dto.getId(), Boolean.FALSE);
     }
 
     @Override
@@ -122,7 +122,7 @@ public class MchManageServiceImpl extends ServiceImpl<MchManageMapper, MchManage
         // 删除缓存
         list.forEach(v -> {
             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<WalletManageMapper, Wal
                 );
             }
             // 同步到正元
-            walletThirdZyService.syncAllUser(userId);
+            // walletThirdZyService.syncAllUser(userId);
         }
     }
 
@@ -443,7 +443,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
         if (ObjectUtil.isEmpty(deptId)) return;
         if (ObjectUtil.isEmpty(isDel)) return;
         // 同步到正元
-        walletThirdZyService.syncAllDept(deptId, isDel);
+        // walletThirdZyService.syncAllDept(deptId, isDel);
     }
 
     private void disposeList(List<WalletManageVo> list, WalletManageDto dto) {