From 211fab13d174fdf8f4424766cfe86a368a650e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=9B=BD=E4=BA=AC?= <565321099@qq.com>
Date: Wed, 25 Jun 2025 10:04:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=B7=A5=E5=8D=95=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StoreOrderServiceImpl.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
index 376c5b8..360f907 100644
--- a/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
+++ b/crmeb-service/src/main/java/com/zbkj/service/service/impl/StoreOrderServiceImpl.java
@@ -1826,20 +1826,20 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
                 storeProductAttrValue.setPrice(detail.getSellPrice());
                 storeProductAttrValue.setStock(10000);
                 storeProductAttrValue.setBarCode(detail.getSkuNo());
-                storeProductAttrValue.setSuk(detail.getSkuName());
+                storeProductAttrValue.setSuk("默认");
                 storeProductAttrValue.setBrokerage(BigDecimal.ZERO);
                 storeProductAttrValue.setBrokerageTwo(BigDecimal.ZERO);
                 storeProductAttrValue.setCost(detail.getSellPrice());
                 storeProductAttrValue.setAttrValue("{\"规格\":\"默认\"}");
-                storeProductAttrValue.setImage("");
+                storeProductAttrValue.setImage("crmebimage/public/maintain/2024/05/13/c394a669b55545f29944d83a5e1d34f5nmzaoxwt26.jpg");
                 storeProductAttrValue.setQuota(10000);
                 storeProductAttrValue.setQuotaShow(10000);
                 storeProductAttrValue.setUnique("");
                 storeProductAttrValueDao.insert(storeProductAttrValue);
             }
             StoreOrderInfo storeOrderInfo=new StoreOrderInfo();
-            storeOrderInfo.setInfo(detail.getSkuName());
-            storeOrderInfo.setImage("");
+
+            storeOrderInfo.setImage(storeProductAttrValue.getImage());
             storeOrderInfo.setOrderNo(orderNo);
             storeOrderInfo.setIsReply(false);
             storeOrderInfo.setAttrValueId(storeProductAttrValue.getId());
@@ -1851,10 +1851,13 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderDao, StoreOrder
             storeOrderInfo.setProductName(detail.getSkuName());
             storeOrderInfo.setProductType(0);
             storeOrderInfo.setUnique(storeProductAttrValue.getId()+"");
-            storeOrderInfo.setSku(detail.getSkuNo());
+            storeOrderInfo.setSku(storeProductAttrValue.getSuk());
             storeOrderInfo.setVolume(BigDecimal.ONE);
             storeOrderInfo.setWeight(BigDecimal.ONE);
-            storeOrderInfo.setVipPrice(BigDecimal.ZERO);
+            storeOrderInfo.setVipPrice(BigDecimal.valueOf(detail.getSellQty()).multiply(detail.getSellPrice()));
+            OrderInfoDetailVo orderInfoDetailVo=new OrderInfoDetailVo();
+            BeanUtils.copyProperties(storeOrderInfo,orderInfoDetailVo);
+            storeOrderInfo.setInfo(JSONObject.toJSONString(orderInfoDetailVo));
             storeOrderInfos.add(storeOrderInfo);
             totalPrice=totalPrice.add(storeOrderInfo.getPrice().multiply(new BigDecimal(storeOrderInfo.getPayNum())));
         }