From e7660adc027d2ea332ab502f4c9efdf1d3bbbd2b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 19 Mar 2025 15:31:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=A3=E5=BA=93=E5=AD=98=E6=94=BE?=
 =?UTF-8?q?=E5=9C=A8=E9=92=B1=E5=8C=85=E6=94=AF=E4=BB=98=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/order/HardCarServiceImpl.java   |  2 +-
 .../service/impl/order/HardOrderServiceImpl.java | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java
index 61fef4b58..e6771ad28 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardCarServiceImpl.java
@@ -253,7 +253,7 @@ public class HardCarServiceImpl extends ServiceImpl<HardCarMapper, HardCarEntity
                     item.setProductPic(spu.getPicUrl());
                     item.setTotalPrice((long) totalPrice);
                     item.setProductCount(v.getProductCount());
-                    item.setProductWeight(new BigDecimal(0));
+                    item.setProductWeight(v.getProductWeight());
                     carObjectList.add(item);
                 });
             }
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 a1fba4ab4..2a2cb0081 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
@@ -265,10 +265,10 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
                 .build();
         if (isPay) orderObj.setWalletId(wallet.getId());
         baseMapper.insert(orderObj);
-        // 钱包扣款
-        if (isPay) getSelf().fastReduceBalance(orderObj);
         // 扣减库存
         getSelf().fastenerInventory(orderObj, YesNoEnum.YES);
+        // 钱包扣款
+        if (isPay) getSelf().fastReduceBalance(orderObj);
         return orderObj.getId();
     }
 
@@ -475,8 +475,16 @@ 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());
-                double weight = BigDecimal.valueOf(v.getProductCount()).multiply(BigDecimal.valueOf(base)).setScale(2, RoundingMode.HALF_UP).doubleValue();
-                item.setIncrCount(weight);
+                // 按数量
+                if (ObjectUtil.isNotEmpty(v.getProductCount()) && !ObjectUtil.equals(v.getProductCount(), 0)) {
+                    double count = BigDecimal.valueOf(v.getProductCount()).multiply(BigDecimal.valueOf(base)).setScale(2, RoundingMode.HALF_UP).doubleValue();
+                    item.setIncrCount(count);
+                }
+                // 按重量
+                if (ObjectUtil.isNotEmpty(v.getProductWeight()) && !ObjectUtil.equals(v.getProductWeight(), 0)) {
+                    double weight = v.getProductWeight().multiply(BigDecimal.valueOf(base)).setScale(2, RoundingMode.HALF_UP).doubleValue();
+                    item.setIncrCount(weight);
+                }
                 return item;
             }).toList();
             dto.setItems(list);