From d91a0659761d71ccb1294a0e73f69de07867cc09 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 22 Oct 2025 18:43:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=B1=E5=AF=8C=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/service/impl/order/HardCarServiceImpl.java   | 11 ++++++++---
 .../hard/service/impl/order/HardOrderServiceImpl.java |  1 -
 2 files changed, 8 insertions(+), 4 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 4d42cf77c..530c531c5 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
@@ -36,6 +36,7 @@ import com.bsd.pjcloud.supermarket.entity.ShopSkuEntity;
 import com.bsd.pjcloud.supermarket.vo.app.ShopSpuDetailAppVo;
 import com.bsd.pjcloud.supermarket.vo.erp.SmErpUnitWithSpuVo;
 import com.bsd.pjcloud.supermarket.vo.mall.MallProductDetailAppVo;
+import com.bsd.pjcloud.supermarket.vo.mall.MallProductSkuAppVo;
 import com.bsd.pjcloud.thirdparty.dto.pay.PayDto;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -422,11 +423,15 @@ public class HardCarServiceImpl extends ServiceImpl<HardCarMapper, HardCarEntity
         // 共富商城
         if (ObjectUtil.equals(sysType, HardTypeEnum.FARMER)) {
             List<HardCarEntity> carObjectList = new ArrayList<>();
-            List<MallProductDetailAppVo> spuList = remoteMallProductService.getDetailByIds(productIds).getData();
+            List<MallProductDetailAppVo> spuList = remoteMallProductService.getSkusWithSpuBySkuIds(productIds).getData();
             for (HardCreateCarDto v : productList) {
                 HardCarEntity item = HardCarEntity.builder().parentCarId(parentCarId).build();
                 spuList.stream().filter(i -> ObjectUtil.equals(i.getId(), v.getProductId())).findFirst().ifPresent(spu -> {
-                    Integer price = getSupermarket(spu);
+                    if (ObjectUtil.isEmpty(spu.getSkuList())) {
+                        throw new RuntimeException("共富商城商品无SKU信息商品名字:" + spu.getTitle() + "商品ID:" + spu.getId() + "请联系管理员");
+                    }
+                    MallProductSkuAppVo skuDetail = spu.getSkuList().get(0);
+                    Integer price = skuDetail.getPrice();
                     int totalPrice = 0;
                     if (ObjectUtil.isNotEmpty(v.getProductCount()) && !ObjectUtil.equals(v.getProductCount(), 0)) {
                         // 按数量
@@ -435,7 +440,7 @@ public class HardCarServiceImpl extends ServiceImpl<HardCarMapper, HardCarEntity
                         // 按重量
                         totalPrice = v.getProductWeight().multiply(BigDecimal.valueOf(price)).setScale(0, RoundingMode.CEILING).intValue();
                     }
-                    item.setProductId(spu.getId());
+                    item.setProductId(skuDetail.getId());
                     item.setProductName(spu.getTitle());
                     item.setProductPrice(price);
                     item.setProductPic(spu.getCoverImage());
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 bf2d91be7..3d1d9b4f4 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
@@ -1317,7 +1317,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
             List<MallProductStockChangeDTO.Item> itemList = carList.stream().map(v -> {
                 MallProductStockChangeDTO.Item item = new MallProductStockChangeDTO.Item();
                 item.setId(v.getProductId());
-                item.setProductType(1);
                 if (ObjectUtil.isNotEmpty(v.getProductCount()) && !ObjectUtil.equals(v.getProductCount(), 0)) {
                     // 按数量
                     int prouctCount = v.getProductCount();