From f96353a4725ad98dc66d25e8dc306c89216f56e7 Mon Sep 17 00:00:00 2001
From: pengsz <pengsz@iesaylink.com>
Date: Thu, 11 Dec 2025 18:41:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor=EF=BC=9A=20=E5=95=86=E5=93=81=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E9=85=8D=E7=BD=AE=20=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yzt/common/request/StoreProductAddRequest.java    | 2 +-
 .../yzt/service/service/impl/StoreOrderInfoServiceImpl.java    | 1 +
 .../com/yzt/service/service/impl/StoreOrderServiceImpl.java    | 1 +
 .../com/yzt/service/service/impl/StoreProductServiceImpl.java  | 3 +++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fightwine-common/src/main/java/com/yzt/common/request/StoreProductAddRequest.java b/fightwine-common/src/main/java/com/yzt/common/request/StoreProductAddRequest.java
index 00e1818..3f0c1a0 100644
--- a/fightwine-common/src/main/java/com/yzt/common/request/StoreProductAddRequest.java
+++ b/fightwine-common/src/main/java/com/yzt/common/request/StoreProductAddRequest.java
@@ -99,7 +99,7 @@ public class StoreProductAddRequest implements Serializable {
 
     @ApiModelProperty(value = "规格 0单 1多", required = true)
     @NotNull(message = "商品规格类型不能为空")
-    private Boolean specType;
+    private Boolean specType = true;
 
     @ApiModelProperty(value = "活动显示排序 0=默认，1=秒杀，2=砍价，3=拼团")
     private List<String> activity;
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderInfoServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderInfoServiceImpl.java
index a6dea29..58defa2 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderInfoServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderInfoServiceImpl.java
@@ -142,6 +142,7 @@ public class StoreOrderInfoServiceImpl extends ServiceImpl<StoreOrderInfoMapper,
             storeOrderInfoVo.getInfo().setIsReply(
                     storeProductReplyService.isReply(storeOrderInfoVo.getUnique(), storeOrderInfoVo.getOrderId()) ? 1 : 0
             );
+            storeOrderInfoVo.getInfo().setImage(storeOrderInfo.getImage());
             storeOrderInfoVoList.add(storeOrderInfoVo);
         }
         return storeOrderInfoVoList;
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java
index 7fbef9f..22b66b0 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreOrderServiceImpl.java
@@ -326,6 +326,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
 
             // 添加订单类型信息
             storeOrderItemResponse.setOrderType(getOrderTypeStr(storeOrder));
+
             detailResponseList.add(storeOrderItemResponse);
         }
         return detailResponseList;
diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java
index 4cf0596..d5d2986 100644
--- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java
+++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StoreProductServiceImpl.java
@@ -941,6 +941,9 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductMapper, Sto
         if (StrUtil.isNotBlank(type) && "recycle".equals(type) && product.getIsDel()) {
             throw new YztException("商品已存在回收站");
         }
+        if (StrUtil.isNotBlank(type) && "recycle".equals(type) && product.getIsShow()) {
+            throw new YztException("商品未下架");
+        }
 
         LambdaUpdateWrapper<StoreProduct> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (StrUtil.isNotBlank(type) && "delete".equals(type)) {