diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/business/ProductBusinessImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/business/ProductBusinessImpl.java index a34f306c1..725176ff5 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/business/ProductBusinessImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/business/ProductBusinessImpl.java @@ -188,6 +188,7 @@ public class ProductBusinessImpl extends BusinessImpl skuService.updateById(Sku.builder().id(skuSnapshot.getSkuId()).skuSnapshotId(skuSnapshot.getId()).build())); }else{ product.setAuthFlag(ProductAuthFlag.WAIT_AUDIT.getCode()); } 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 642fd590d..18ea19c86 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,12 +5,15 @@ 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 org.apache.ibatis.type.JdbcType; import org.dromara.common.core.domain.model.BaseAudit; import org.dromara.common.excel.annotation.Excel; +import java.io.Serial; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -22,12 +25,17 @@ import java.math.BigDecimal; @Schema(description = "SKU信息对象") @Data @TableName("pms_sku") -public class Sku extends BaseAudit { +@Builder +public class Sku extends BaseAudit implements Serializable { + @Serial private static final long serialVersionUID = 1L; @Schema(description = "ID") private Long id; + @Schema(description = "sku实时快照id") + private Long skuSnapshotId; + @Schema(description = "PRODUCT_ID") @Excel(name = "PRODUCT_ID") private Long productId; diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java index 06152f123..8a7fcf602 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java @@ -245,7 +245,9 @@ public class OrderServiceImpl extends ServiceImpl implements return OrderItem.builder() .orderId(order.getId()) .productId(sku.getProductId()) + .productSnapshotId(product.getProductSnapshotId()) .skuId(sku.getId()) + .skuSnapshotId(sku.getSkuSnapshotId()) .productName(product != null ? product.getName() : "") .pic(sku.getPic()) .salePrice(sku.getPrice())