From 266ad175b79b3263b0cc0a3909772fc64bee4085 Mon Sep 17 00:00:00 2001
From: huk <hu_care_you@163.com>
Date: Sun, 28 Sep 2025 16:29:06 +0800
Subject: [PATCH] =?UTF-8?q?refactor(order):=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E4=B8=8E=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 AppOrderController 中不必要的空行
- 为 Sku 类添加全参和无参构造函数
- 移除 OrderBusinessImpl 中设置核销码的逻辑
- 简化 OrderItemVO 和 OrderVO 中字段的注释描述
- 更新订单状态和核销码状态的 Schema 描述及实现类引用
- 移除 OrderVO 中冗余的 verificationCodes 字段
---
 .../org/dromara/app/customer/AppOrderController.java  |  1 -
 .../java/com/wzj/soopin/goods/domain/entity/Sku.java  |  6 +++---
 .../soopin/order/business/impl/OrderBusinessImpl.java |  2 --
 .../com/wzj/soopin/order/domain/vo/OrderItemVO.java   | 11 ++++++-----
 .../java/com/wzj/soopin/order/domain/vo/OrderVO.java  |  8 ++++----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java b/ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java
index b7f098f1f..e67ac5b23 100644
--- a/ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java
@@ -41,7 +41,6 @@ public class AppOrderController {
     @PostMapping("/page")
     public R<IPage<OrderVO>> page(@RequestBody OrderBo bo){
         LoginUser loginUser= LoginHelper.getLoginUser();
-
         bo.setMemberId(loginUser.getUserId());
         return R.ok(memberOrderService.page(bo));
     }
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java
index 18ea19c86..06cdbcf82 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Sku.java
@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
 import org.apache.ibatis.type.JdbcType;
 import org.dromara.common.core.domain.model.BaseAudit;
 import org.dromara.common.excel.annotation.Excel;
@@ -26,6 +24,8 @@ import java.math.BigDecimal;
 @Data
 @TableName("pms_sku")
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class Sku extends BaseAudit implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
index a1d59742d..e2ee286ce 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java
@@ -60,10 +60,8 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
                 });
             return itemVO;
         }).collect(Collectors.toList());
-
         vo.setItems(itemVOList);
         //核销码
-        vo.setVerificationCodes(verificationCodeService.getByOrderId(vo.getId()));
         return vo;
     }
 
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java
index acab990ef..d2124255e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java
@@ -86,9 +86,9 @@ public class OrderItemVO extends BaseAudit {
     @Excel(name = "商品分类id")
     private Long productCategoryId;
 
-    /** 商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] */
-    @Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
-    @Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
+    /** 商品sku属性 */
+    @Schema(description = "商品sku属性")
+    @Excel(name = "商品sku属性")
     private String spData;
 
     private String tenantId;
@@ -101,9 +101,10 @@ public class OrderItemVO extends BaseAudit {
     @Schema(description = "核销码")
     private String code;
     /**
-     * 状态 见{@link VerificationCodeStatus}
+     * 状态
+     * @see VerificationCodeStatus#getCode()
      */
-    @Schema(description = "状态")
+    @Schema(description = "状态", implementation = VerificationCodeStatus.class)
     private Integer status;
 
     @Schema(description = "用户id")
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
index c8d17ca3e..37b7137f5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderVO.java
@@ -2,6 +2,7 @@ package com.wzj.soopin.order.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.wzj.soopin.order.domain.entity.VerificationCodes;
+import com.wzj.soopin.order.emum.OrderStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.dromara.common.core.domain.model.BaseAudit;
@@ -62,8 +63,10 @@ public class OrderVO extends BaseAudit {
     private Integer payType;
 
     /**
-     *  订单状态枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum}
+     *  订单状态
+     * @see OrderStatusEnum#getValue()
      */
+    @Schema(description ="订单状态", implementation = OrderStatusEnum.class)
     private Integer status;
 
     @Schema(description="是否处于退款状态")
@@ -130,9 +133,6 @@ public class OrderVO extends BaseAudit {
     @Schema(description = "配送方式 1->到店核销；2->自提;3->配送;")
     private Integer distribution;
 
-    @Schema(description = "核销码")
-    private List<VerificationCodes> verificationCodes;
-
     @Schema(description = "使用的优惠卷id")
     private Long memberCouponId;