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

相关字段增加

See merge request quanshu/mp-server!939

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

@@ -0,0 +1,46 @@
+package com.qs.mp.common.enums;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IEnum;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 盲票关联商品枚举
+ * @author Cup
+ * @date 2022/8/4
+ */
+@ApiModel("盲票关联商品枚举")
+public enum TicketBoxGoodsTypeEnum implements IEnum<String> {
+
+
+    GOODS("goods", "商品"),
+    COUPON("coupon", "优惠券"),
+    COUPON_PKG("coupon_pkg", "优惠券包"),
+    COIN("coin", "盲豆");
+
+    private final String value;
+    private final String desc;
+
+    TicketBoxGoodsTypeEnum(final String value, final String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 重写toString，单个转化成json
+     * @return
+     */
+    @Override
+    public String toString() {
+        JSONObject object = new JSONObject();
+        object.put("value",value);
+        object.put("desc", desc);
+        return object.toString();
+    }
+
+}

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

@@ -1,7 +1,11 @@
 package com.qs.mp.admin.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.qs.mp.common.enums.TicketBoxGoodsTypeEnum;
+import com.qs.mp.common.enums.TicketPrizeTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -52,6 +56,15 @@ public class TicketBoxGoods implements Serializable {
     @TableField("pic_url")
     private String picUrl;
 
+
+    /**
+     * 商品类型:goods实物商品 coupon优惠券 coin平台代币 coupon_pkg券包
+     */
+    @ApiModelProperty("商品类型:goods实物商品 coupon优惠券 coin平台代币 coupon_pkg券包")
+    @TableField("type")
+    @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
+    private TicketBoxGoodsTypeEnum type;
+
     /**
      * 关联商品id
      */