Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!433

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
+import com.github.xiaoymin.knife4j.annotations.DynamicParameters;
 import com.qs.mp.admin.domain.Goods;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.admin.domain.GoodsTagRel;
@@ -152,6 +154,9 @@ public class GoodsMgrController extends BaseApiController {
   @PostMapping(value = "/detail")
   @PreAuthorize("@ss.hasPermi('business:goods:query')")
   @ApiOperation("商品详情接口")
+  @DynamicParameters(properties = {
+          @DynamicParameter(name = "goodsId",value = "商品id",required = true,dataTypeClass = Long.class)
+  })
   @ApiResponses(
           @ApiResponse(code = 200, message = "查询成功", response = GoodsVO.class)
   )

mp-service/src/main/java/com/qs/mp/admin/domain/Goods.java

@@ -120,6 +120,12 @@ public class Goods implements Serializable {
   @TableField("exchange_show")
   private Integer exchangeShow;
 
+
+  @ApiModelProperty("商家信息")
+  @TableField("merchant_info")
+  private String merchantInfo;
+
+
   @ApiModelProperty("排序权重，越大越靠前")
   @TableField("sort_weight")
   private Integer sortWeight;

mp-service/src/main/java/com/qs/mp/admin/domain/GoodsSku.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,6 +18,7 @@ import lombok.Data;
  */
 @TableName("mp_goods_sku")
 @Data
+@ApiModel("商品规格实体类")
 public class GoodsSku implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -22,78 +26,91 @@ public class GoodsSku implements Serializable {
   /**
    * 主键
    */
+  @ApiModelProperty("skuId,主键")
   @TableId(value = "sku_id", type = IdType.AUTO)
   private Long skuId;
 
   /**
    * 商品ID
    */
+  @ApiModelProperty("商品id")
   @TableField("goods_id")
   private Long goodsId;
 
   /**
    * sku名称
    */
+  @ApiModelProperty("sku名称")
   @TableField("name")
   private String name;
 
   /**
    * 图片
    */
+  @ApiModelProperty("图片")
   @TableField("pic_url")
   private String picUrl;
 
   /**
    * 属性组合字符串 格式是p1:v1;p2:v2
    */
+  @ApiModelProperty("属性组合字符串 格式是p1:v1;p2:v2")
   @TableField("properties")
   private String properties;
 
   /**
    * 原兑换价格
    */
+  @ApiModelProperty("原兑换价格")
   @TableField("origin_price")
   private Integer originPrice;
 
   /**
    * 现兑换价格
    */
+  @ApiModelProperty("现兑换价格")
   @TableField("exchange_price")
   private Integer exchangePrice;
 
   /**
    * 商品价格
    */
+  @ApiModelProperty("商品价格")
   @TableField("value")
   private Integer value;
 
   /**
    * 商品成本
    */
+  @ApiModelProperty("商品成本")
   @TableField("cost")
   private Integer cost;
 
   /**
    * 库存数
    */
+  @ApiModelProperty("库存数")
   @TableField("quantity")
   private Integer quantity;
 
   /**
    * 已兑换数
    */
+  @ApiModelProperty("已兑换数")
   @TableField("sold_qty")
   private Integer soldQty;
 
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   private Date updatedTime;
 

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsParam.java

@@ -2,6 +2,7 @@ package com.qs.mp.admin.domain.param;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.common.enums.GoodsStatusEnum;
 
@@ -112,4 +113,9 @@ public class GoodsParam {
 	@ApiModelProperty(value = "商品标签ID列表", required = false)
 	private List<Long> tagIds;
 
+
+	@ApiModelProperty("商家信息")
+	private String merchantInfo;
+
+
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/GoodsVO.java

@@ -2,116 +2,146 @@ package com.qs.mp.admin.domain.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.common.enums.GoodsStatusEnum;
 
 import java.util.Date;
 import java.util.List;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * @describe 商品库实体类
+ * @describe 商品详情VO类
  * @auther quanshu
  * @create 2022-03-07 20:43:44
  */
 @Data
+@ApiModel("商品详情VO类")
 public class GoodsVO {
 
 	/**
 	 * 规格列表
 	 */
+	@ApiModelProperty("规格列表")
 	private List<GoodsSku> skuList;
 
+	@ApiModelProperty("商品id")
 	private Long goodsId;
 	/**
 	 * 商品标题
 	 */
+	@ApiModelProperty("商品标题")
 	private String title;
 
 	/**
 	 * 商品类目ID
 	 */
+	@ApiModelProperty("商品类目ID")
 	private Long categoryId;
 
 	/**
 	 * 商品图片
 	 */
+	@ApiModelProperty("商品图片")
 	private String picUrl;
 
 	/**
 	 * 详情
 	 */
+	@ApiModelProperty("详情")
 	private String description;
 
 	/**
 	 * 原兑换价格
 	 */
+	@ApiModelProperty("原兑换价格")
 	private Integer originPrice;
 
 	/**
 	 * 现兑换价格
 	 */
+	@ApiModelProperty("现兑换价格")
 	private Integer exchangePrice;
 
 	/**
 	 * 商品价值
 	 */
+	@ApiModelProperty("商品价值")
 	private Integer value;
 
 	/**
 	 * 商品成本
 	 */
+	@ApiModelProperty("商品成本")
 	private Integer cost;
 
 	/**
 	 * 库存数量
 	 */
+	@ApiModelProperty("库存数量")
 	private Integer quantity;
 
 	/**
 	 * 已兑换量
 	 */
+	@ApiModelProperty("已兑换量")
 	private Integer exchangedQty;
 
 	/**
 	 * 兑换大厅是否展示，0不展示，1展示
 	 */
+	@ApiModelProperty("兑换大厅是否展示，0不展示，1展示")
 	private Integer exchangeShow;
 
 	/**
 	 * 是否多sku，0否，1是
 	 */
+	@ApiModelProperty("是否多sku，0否，1是")
 	private Integer multiSku;
 
 	/**
 	 * 规格描述
 	 */
+	@ApiModelProperty("规格描述")
 	private String skuProp;
 
 	/**
 	 * 上架状态;上架/下架
 	 */
+	@ApiModelProperty("上架状态;上架/下架")
 	@JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
 	private GoodsStatusEnum status;
 
 	/**
 	 * 逻辑删除标识
 	 */
+	@ApiModelProperty("逻辑删除标识")
 	private Integer isDeleted;
 
 	/**
 	 * 标签ID列表
 	 */
+	@ApiModelProperty("标签ID列表")
 	private List<Long> tagIds;
 
+
+
+	@ApiModelProperty("商家信息")
+	private String merchantInfo;
+
+
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty("创建时间")
 	private Date createdTime;
 
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty("更新时间")
 	private Date updatedTime;
 }

mp-service/src/main/resources/mapper/user/UserTicketOrderItemMapper.xml

@@ -31,8 +31,8 @@
          left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
          left join mp_ticket t3 on t1.ticket_id = t3.ticket_id
          left join mp_ticket_box t4 on t3.box_id = t4.box_id
-         left join mp_user_hit_prize t5 on t2.order_id = t5.order_id
-         left join mp_ticket_awards_prize t6 on t5.prize_id = t6.prize_id
+         left join mp_user_hit_prize t5 on t5.ticket_id = t1.ticket_id
+         left join mp_ticket_awards_prize t6 on t6.prize_id = t5.prize_id
             ${ew.customSqlSegment}
     </select>