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

Dev

See merge request quanshu/mp-server!67

mp-common/src/main/java/com/qs/mp/common/enums/TicketPrizeTypeEnum.java

@@ -15,7 +15,7 @@ public enum TicketPrizeTypeEnum implements IEnum<String> {
 
   GOODS("goods", "商品"),
   COUPON("coupon", "优惠券"),
-  COIN("coin", "盲币");
+  COIN("coin", "盲豆");
 
   private final String value;
   private final String desc;

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

@@ -68,6 +68,12 @@ public class Goods implements Serializable {
   @TableField("value")
   private Integer value;
 
+  /**
+   * 商品成本
+   */
+  @TableField("cost")
+  private Integer cost;
+
   /**
    * 库存数量
    */

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

@@ -61,11 +61,23 @@ public class GoodsSku implements Serializable {
   @TableField("sale_price")
   private Integer salePrice;
 
+  /**
+   * 商品价格
+   */
+  @TableField("value")
+  private Integer value;
+
+  /**
+   * 商品成本
+   */
+  @TableField("cost")
+  private Integer cost;
+
   /**
    * 库存数
    */
-  @TableField("stocks")
-  private Integer stocks;
+  @TableField("quantity")
+  private Integer quantity;
 
   /**
    * 已兑换数

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

@@ -1,6 +1,9 @@
 package com.qs.mp.admin.domain.param;
 
+import com.qs.mp.common.enums.TicketPrizeTypeEnum;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -10,5 +13,19 @@ import lombok.Data;
 @ApiModel(value= "盲票组奖级对应的奖品参数")
 @Data
 public class TicketAwardsPrizeParam {
+  @NotNull(message = "奖品关联ID不能为空")
+  @ApiModelProperty(value = "奖品关联ID",required=true)
+  private String refId;
 
+  @NotNull(message = "奖品类型不能为空")
+  @ApiModelProperty(value = "奖品类型",required=true)
+  private TicketPrizeTypeEnum prizeType;
+
+  @NotNull(message = "奖品数量不能为空")
+  @ApiModelProperty(value = "奖品数量",required=true)
+  private Integer quantity;
+
+  @NotNull(message = "奖品价值不能为空")
+  @ApiModelProperty(value = "奖品价值",required=true)
+  private Integer value;
 }

mp-service/src/main/resources/mapper/admin/GoodsMapper.xml

@@ -12,6 +12,7 @@
         <result column="origin_price" property="originPrice" />
         <result column="exchange_price" property="exchangePrice" />
         <result column="value" property="value" />
+        <result column="cost" property="cost" />
         <result column="quantity" property="quantity" />
         <result column="exchanged_qty" property="exchangedQty" />
         <result column="status" property="status" />
@@ -24,7 +25,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        goods_id, title, category_id, pic_url, description, origin_price, exchange_price, value, quantity, exchanged_qty, status, exchange_show, multi_sku, is_deleted, created_time, updated_time
+        goods_id, title, category_id, pic_url, description, origin_price, exchange_price, value, cost, quantity, exchanged_qty, status, exchange_show, multi_sku, is_deleted, created_time, updated_time
     </sql>
 
 </mapper>

mp-service/src/main/resources/mapper/admin/GoodsSkuMapper.xml

@@ -11,7 +11,9 @@
         <result column="properties" property="properties" />
         <result column="origin_price" property="originPrice" />
         <result column="sale_price" property="salePrice" />
-        <result column="stocks" property="stocks" />
+        <result column="value" property="value" />
+        <result column="cost" property="cost" />
+        <result column="quantity" property="quantity" />
         <result column="sold_qty" property="soldQty" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -19,7 +21,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        sku_id, goods_id, name, pic_url, properties, origin_price, sale_price, stocks, sold_qty, created_time, updated_time
+        sku_id, goods_id, name, pic_url, properties, origin_price, sale_price, value, cost, quantity, sold_qty, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>