Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/entity/ShopSpuEntity.java

@@ -104,7 +104,7 @@ public class ShopSpuEntity extends Model<ShopSpuEntity> {
 	* 商户关系表
 	*/
     @Schema(description="商户关系表")
-    private Long merchantRelationId;
+    private String merchantIds;
 
 	/**
 	* 部门id
@@ -176,8 +176,4 @@ public class ShopSpuEntity extends Model<ShopSpuEntity> {
     @EntityMapping(thisField = "id", joinField = "spuId")
     private List<ShopSkuEntity> skuList;
 
-
-	@TableField(exist = false)
-	@Schema(description="关联的商户id")
-	private List<Long> merchantIds;
 }

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/ShopSkuAppVo.java

@@ -1,11 +1,53 @@
 package com.bsd.pjcloud.supermarket.vo.app;
 
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 public class ShopSkuAppVo {
+    /**
+     * 包装单位id
+     */
+    @Schema(description="包装单位id")
     private Long id;
-    private String skuName;
-    private Integer price;
-    private Integer stock;
+    /**
+     * 条码
+     */
+    @Schema(description="条码")
+    private String barCode;
+    /**
+     * 规格
+     */
+    @Schema(description="规格")
+    private String spec;
+    /**
+     * 单位
+     */
+    @Schema(description="单位")
+    private String unit;
+
+    /**
+     * 零售价/单位分
+     */
+    @Schema(description="零售价/单位分")
+    private Integer retailPrice;
+
+    /**
+     * 促销价
+     */
+    @Schema(description="促销价")
+    private Integer promotionPrice;
+    /**
+     * 库存
+     */
+    @Schema(description="库存")
+    private Double stock;
+    /**
+     * sku属性
+     */
+    @Schema(description="sku属性")
+    private String attribute;
 } 

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/ShopSpuDetailAppVo.java

@@ -1,16 +1,80 @@
 package com.bsd.pjcloud.supermarket.vo.app;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.baomidou.mybatisplus.annotation.*;
+import com.github.yulichang.annotation.EntityMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 public class ShopSpuDetailAppVo {
+    /**
+     * 商品 SPU 编号，自增
+     */
+    @Schema(description="商品 SPU 编号，自增")
     private Long id;
+
+    /**
+     * 货号
+     */
+    @Schema(description="货号")
+    private String productCode;
+
+    /**
+     * 商品名称
+     */
+    @Schema(description="商品名称")
     private String productName;
+
+
+    /**
+     * 商品详情
+     */
+    @Schema(description="商品详情")
+    private String description;
+
+    /**
+     * 商品分类编号
+     */
+    @Schema(description="商品分类编号")
+    private Long categoryId;
+
+    /**
+     * 商品封面图
+     */
+    @Schema(description="商品封面图")
     private String picUrl;
-    private String subTitle;
-    private String detail;
-    private Integer categoryId;
-    private Integer status;
+
+    /**
+     * 商品轮播图地址
+     数组，以逗号分隔
+     最多上传15张
+     */
+    @Schema(description="商品轮播图地址")
+    private String sliderPicUrls;
+
+
+    /**
+     * 商户关系表
+     */
+    @Schema(description="商户关系表")
+    private String merchantIds;
+
+    /**
+     * 销量
+     */
+    @Schema(description="销量")
+    private Integer salesCount;
+
+    /**
+     * 单人限购数量
+     */
+    @Schema(description="单人限购数量")
+    private Integer limitNum;
+
+
     private List<ShopSkuAppVo> skuList;
 } 

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/ShopSpuListAppVo.java

@@ -1,15 +1,40 @@
 package com.bsd.pjcloud.supermarket.vo.app;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 @Data
 public class ShopSpuListAppVo {
+    /**
+     * 商品 SPU 编号，自增
+     */
+    @Schema(description="商品 SPU 编号，自增")
     private Long id;
+
+    /**
+     * 货号
+     */
+    @Schema(description="货号")
+    private String productCode;
+
+    /**
+     * 商品名称
+     */
+    @Schema(description="商品名称")
     private String productName;
+
+    /**
+     * 商品封面图
+     */
+    @Schema(description="商品封面图")
     private String picUrl;
-    private String subTitle;
-    private Integer categoryId;
-    private Integer status;
-    private Integer sales;
-    private Integer price;
+
+    /**
+     * 商品分类编号
+     */
+    @Schema(description="商品分类编号")
+    private Long categoryId;
+
 } 

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/ShopSpuMapper.xml

@@ -16,7 +16,7 @@
         <result property="status" column="status"/>
         <result property="stock" column="stock"/>
         <result property="giveIntegral" column="give_integral"/>
-        <result property="merchantRelationId" column="merchant_relation_id"/>
+        <result property="merchantIds" column="merchant_ids"/>
         <result property="deptId" column="dept_id"/>
         <result property="shopSkuId" column="shop_sku_id"/>
         <result property="salesCount" column="sales_count"/>