Merge branch 'master' into bug_sweet_stage

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRealNameService.java

@@ -15,4 +15,6 @@ public interface IAdamRealNameService {
     void add(AdamRealName realName);
 
     void upsert(AdamRealName realName, boolean updateFlg);
+
+    void update(AdamRealName realName, String mobile);
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

@@ -70,4 +70,6 @@ public interface IAdamUserService {
     AdamRealInfoVo identity(String uid, String name, String idCard, String mobile);
 
     AdamRealInfoVo identityForUpsert(String uid, String name, String idCard, String mobile, boolean updateFlg);
+
+    AdamRealInfoVo identityForUpdate(String uid, String mobile, int idType, int node, String idCard, String idName);
 }

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyConstant.java

@@ -11,6 +11,7 @@ package com.liquidnet.service.galaxy.constant;
  */
 public class GalaxyConstant {
     //可删除key
+    public static final String REDIS_KEY_GALAXY_USER_ID_CARD="galaxy:user_id_card:";
     public static final String REDIS_KEY_GALAXY_USER="galaxy:user:";
     public static final String REDIS_KEY_GALAXY_SERIES="galaxy:series:";
     public static final String REDIS_KEY_GALAXY_SERIES_NFT_UPLOAD="galaxy:series:nft:upload:";
@@ -21,7 +22,8 @@ public class GalaxyConstant {
     //以下禁止删除
     public static final String REDIS_KEY_GALAXY_PUBLISH_NFT="galaxy:publish:nft:"; //nft索引递增记录
 
+    public static final String SERIES_NAME_PREFIX="NOW_ZXL_";// 系列存储目录名称和系列声明
 
+    public static final String ADAM_USER_SYNC_URL="/adam/rsc/syn/certmeta";// adam用户开通数字账户信息同步url
 
-    public static final String SERIES_NAME_PREFIX="NOW_ZXL_";// 系列存储目录名称和系列声明
 }

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/constant/GalaxyErrorEnum.java

@@ -32,7 +32,8 @@ public enum GalaxyErrorEnum {
     NFT_PUBLISH_AND_BUY_QUERY_FAIL("NFT0010019","NFT发行和购买结果查询失败!"),
     NFT_QUERY_FAIL_ORDER_NOT_EXIST("NFT0010020","NFT订单不存在!"),
     NFT_QUERY_FAIL_NFT_NOT_EXIST("NFT0010021","NFT信息查询不存在!"),
-    NFT_QUERY_FAIL_SERIES_NOT_EXIST("NFT0010022","系列信息查询不存在!");
+    NFT_QUERY_FAIL_SERIES_NOT_EXIST("NFT0010022","系列信息查询不存在!"),
+    NFT_USER_HAS_OPEN_ACCOUNT("NFT0010023","用户已经开通过数字账户!");
 
 
     private String code;

liquidnet-bus-api/liquidnet-service-galaxy-api/src/main/java/com/liquidnet/service/galaxy/exception/GalaxyNftUserException.java

+package com.liquidnet.service.galaxy.exception;
+
+import lombok.Data;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: 自定义异常类
+ * @class: GalaxyNftUserException
+ * @Package com.liquidnet.service.galaxy.exception
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/5/12 13:44
+ */
+@Data
+public class GalaxyNftUserException extends RuntimeException{
+       private static final long serialVersionUID = -3916918823313768482L;
+       private String code;
+       private String message;
+
+       public GalaxyNftUserException(String code, String message) {
+             super(message);
+             this.code = code;
+             this.message = message;
+       }
+
+       public GalaxyNftUserException(String code, String message, Throwable t) {
+             super(message, t);
+             this.code = code;
+             this.message = message;
+       }
+}
+

liquidnet-bus-api/liquidnet-service-goblin-api/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>liquidnet-service-goblin-do</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.0.5</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -124,21 +124,22 @@ public class GoblinRedisConst {
     public static final String REDIS_GOBLIN_TEMP_COUPON = PREFIX.concat("temp:coupon:");//详情 $key:$ucouponId
 
     /* --------------------------------NFT--------------------------------- */
-    /*public static final String REDIS_GOBLIN_NFT_ORDER_INFO = PREFIX.concat("nftOrder:");// nft订单详情 orderId
-    public static final String REDIS_GOBLIN_NFT_ORDER_ID_OF_CODE = PREFIX.concat("nftOrder:orderCode:");// nft订单ID获取 orderCode
-    public static final String REDIS_GOBLIN_NFT_ORDER_USER_ID_LIST = PREFIX.concat("nftOrder:idList:user:");// nft用户订单id列表 userId
-    public static final String REDIS_GOBLIN_NFT_ORDER_REFUND_INFO = PREFIX.concat("nftOrder:refund:");// nft退款订单详情 orderId
-    public static final String REDIS_GOBLIN_NFT_ORDER_BUG_LOCK = PREFIX.concat("nftOrder:lock:userId:");// nft购买用户锁 userId
-    public static final String REDIS_GOBLIN_NFT_GOODS_LIST = PREFIX.concat("nftGoodsList");// nft商品列表
-    public static final String REDIS_GOBLIN_NFT_NUM_ACCOUNT = PREFIX.concat("nftNumAccount:");// nft用户数字账户是否开通 userId*/
-
     public static final String REDIS_GOBLIN_NFT_ORDER_INFO = PREFIX.concat("nft:order:id:");// nft订单详情 orderId
     public static final String REDIS_GOBLIN_NFT_ORDER_ID_OF_CODE = PREFIX.concat("nft:order:code:");// nft订单ID获取 orderCode
     public static final String REDIS_GOBLIN_NFT_ORDER_USER_ID_LIST = PREFIX.concat("nft:order:idList:");// nft用户订单id列表 userId
     public static final String REDIS_GOBLIN_NFT_ORDER_REFUND_INFO = PREFIX.concat("nft:order:refund:");// nft退款订单详情 orderId
     public static final String REDIS_GOBLIN_NFT_ORDER_BUG_LOCK = PREFIX.concat("nft:order:lock:");// nft购买用户锁 userId
+    public static final String REDIS_GOBLIN_NFT_ORDER_EX_LOCK = PREFIX.concat("nft:order:exLock:");// nft兑换码锁 code
     public static final String REDIS_GOBLIN_NFT_GOODS_LIST = PREFIX.concat("nft:goodsList");// nft商品列表
+    public static final String REDIS_GOBLIN_NFT_GOODS_LIST_INFO = PREFIX.concat("nft:goodsList:info:");// nft商品列表单藏品详情 skuId
     public static final String REDIS_GOBLIN_NFT_NUM_ACCOUNT = PREFIX.concat("nft:account:");// nft用户数字账户是否开通 userId
+    public static final String REDIS_GOBLIN_NFT_NUM_ACCOUNT_INFO = PREFIX.concat("nft:account:info:");// nft用户数字账户开通信息 userId
+    public static final String REDIS_GOBLIN_NFT_NOT_PAY_NUM = PREFIX.concat("nft:notPay:");// nft藏品待支付订单数量 skuId:listId
+    /**
+     * {goblin:nft:certmeta:{idType+idNo},{idname,mobile}}
+     */
+    public static final String REDIS_GOBLIN_NFT_CERTMETA = PREFIX.concat("nft:certmeta:");
+    public static final String REDIS_GOBLIN_NFT_CERTMETA_JUNK = PREFIX.concat("nft:certmeta_junk:");
 
 
 
@@ -156,7 +157,7 @@ public class GoblinRedisConst {
      */
     public static final String STORE_COUPON = PREFIX.concat("s_coupon:");
     /**
-     * 商铺活动:优惠券适用商品ID集合
+     * 商铺活动:优惠券适用商品ID集合item
      * {goblin:s_coupon_r:${store_coupon_id}, JsonUtils.toJson(List<String:spu_id>)}
      */
     public static final String STORE_COUPON_RULE = PREFIX.concat("s_coupon_r:");
@@ -234,15 +235,91 @@ public class GoblinRedisConst {
 
     /**
      * skuId保存预约用户头像
-     *  {anticipate:skuId:avatar:${skuId},List<String>}
+     * {anticipate:skuId:avatar:${skuId},List<String>}
      */
     public static final String ANTICIPATE_SKUID_AVATAR = PREFIX.concat("anticipate:skuId:avatar:");
 
-
     public static final String ANTICIPATE_VALUE_SKUID = PREFIX.concat("anticipate:value:skuid:");
 
     public static final String NFT_PAY_TYPE = PREFIX.concat("nft:payType");
 
+    public static final String LIST_DETAILS = PREFIX.concat("list:");//名单列表详情 $key:$listId
+    public static final String REDIS_BLACK = PREFIX.concat("black:");//黑名单 key:$listId:$skuId:$mobile
+    public static final String REDIS_WHITE = PREFIX.concat("white:");//白名单 key:$listId:$skuId:$mobile
+    public static final String LIST_COLLECT = PREFIX.concat("list:collect");//名单列表详情 $key:$skuId
+    public static final String ADAM_IS_MEMBER = "kylin:member:uid:";//是否会员 $key:$uid
+    public static final String LIST_RELATION_BOX = PREFIX.concat("list:relation:box");//名单列表详情 $key:$skuId:$listId
+    /**
+     * nft兑换活动配置
+     */
+    public static final String NFT_EX_ACTIVITY = PREFIX.concat("nft:ex:activity:");
+
+    /**
+     * nft兑换活动和sku的关联
+     */
+    public static final String NFT_EX_SKU = PREFIX.concat("nft:ex:sku:");
+
+    /**
+     * 兑换码
+     */
+    public static final String NFT_EX_CODE = PREFIX.concat("nft:ex:code:");
+
+    /**
+     * 用户sku兑换数量 activityId、skuId、userId
+     */
+    public static final String REDIS_GOBLIN_EX_BUY_COUNT = PREFIX.concat("nft:ex:buy:");
+
+
+    /**
+     * 用户助力
+     */
+    public static final String ANTICIPATE_SHARE_UID_SKUID = PREFIX.concat("anticipate:share:uid:skuId:");
+
+    /**
+     * skuId助力所需人数
+     */
+    public static final String ANTICIPATE_SHARE_SKUID_PEOPLE = PREFIX.concat("anticipate:share:skuId:people:");
+
+    /**
+     * 助力头像保存
+     */
+    public static final String ANTICIPATE_SHARE_HELP_AVATAR = PREFIX.concat("anticipate:share:help:avatar:");
+
+    /**
+     * 创建分享vo
+     */
+    public static final String ANTICIPATE_SHARE_VO = PREFIX.concat("anticipate:share:help:vo:");
+
+    /**
+     * 用户助力  助力人id:分享id
+     */
+    public static final String ANTICIPATE_SHARE_HELPID_SID = PREFIX.concat("anticipate:share:helpId:sid:");
+
+    /**
+     * 助力sid
+     */
+    public static final String ANTICIPATE_SHARE_SID = PREFIX.concat("anticipate:share:sid:");
+
+
+    /**
+     * 活动兑换码
+     */
+    public static final String ACTIVITY_SKU_CODE = PREFIX.concat("activity:sku:code:");
+
+    /**
+     * 兑换码sku时间
+     */
+    public static final String ACTIVITY_SKU_TIME = PREFIX.concat("activity:sku:time:");
+
+    /**
+     * 是否购买过技术数字藏品
+     */
+    public static final String BUY_NFT_TEC = PREFIX.concat("buy:nft:tec:");// $key+$uid 是否购买过技术数字藏品
+
+    /**
+     * 是否开启技术数字藏品特效
+     */
+    public static final String OPEN_NFT_TEC = PREFIX.concat("open:nft:tec:");//$key+$uid 是否开启技术数字藏品特效
 
 
     /* ----------------------------------------------------------------- */

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinStatusConst.java

@@ -199,6 +199,7 @@ public class GoblinStatusConst {
         ORDER_TYPE_1(1, "购买订单"),
         ORDER_TYPE_2(2, "兑换订单"),
         ORDER_TYPE_3(3, "演出赠送订单"),
+        ORDER_TYPE_4(4, "空投订单"),
 
         ;
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/NftAccStatusEnum.java

+package com.liquidnet.service.goblin.constant;
+
+public class NftAccStatusEnum {
+    /**
+     * 数字账户开通状态
+     */
+    public enum StatusAcc {
+        ING("1000", "开通中"),
+        SUCCESS("2000", "开通成功"),
+        FAILURE1("3000", "实名失败"),
+        FAILURE2("3001", "开通失败可重试"),
+        FAILURE3("3002", "该身份证已开通数字账号 不可重复操作"),
+        ;
+        private final String code;
+        private final String msg;
+
+        StatusAcc(String code, String msg) {
+            this.code = code;
+            this.msg = msg;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getMsg() {
+            return msg;
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/GoblinUserNftAccInfoVo.java

+package com.liquidnet.service.goblin.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "GoblinUserNftAccInfoVo", description = "数字账户开通信息")
+@Data
+public class GoblinUserNftAccInfoVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 9036417838200526658L;
+
+    @ApiModelProperty(position = 11, value = "状态码 1000开通中 2000开通成功 3000实名失败 3001开通失败可重试 3002该身份证已开通数字账号 不可重复操作")
+    private String code;
+    @ApiModelProperty(position = 12, value = "提示信息")
+    private String msg;
+    @ApiModelProperty(position = 13, value = "最后操作的时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime time;
+
+    private static final GoblinUserNftAccInfoVo obj = new GoblinUserNftAccInfoVo();
+
+    public static GoblinUserNftAccInfoVo getNew() {
+        try {
+            return (GoblinUserNftAccInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinUserNftAccInfoVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinGoodsAnticipateAddParam.java

@@ -8,28 +8,43 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- *
  * @author liquidnet
  * @since 2022-04-07
  */
-@ApiModel(value = "GoblinGoodsAnticipateParam", description = "预约")
+@ApiModel(value = "GoblinGoodsAnticipateParam", description = "创建预约")
 @Data
 public class GoblinGoodsAnticipateAddParam {
 
+    /**
+     * 预约名称
+     */
+//    @ApiModelProperty(value = "预约名称")
+//    @NotBlank(message = "预约名称")
+//    private String name;
+
     /**
      * 预约规则
      */
-    @ApiModelProperty(value = "预约规则")
+    @ApiModelProperty(required = true,value = "预约规则")
     @NotBlank(message = "预约规则")
     private String rule;
 
+    @ApiModelProperty(required = true, value = "预约类型（1：预约提醒，2：预约获得购买资格）")
+    @NotNull(message = "预约类型")
+    private int type;
+
+    @ApiModelProperty(value = "预约人数（达到一定人数可以预约）")
+    private Integer people;
 
-    @ApiModelProperty("sku信息")
+    @ApiModelProperty(required = true,value = "sku信息")
+    @NotNull(message = "skuList并不能为空")
     private List<GoblinGoodsAnticipateValueAddParam> list;
 
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinGoodsAnticipateValueAddParam.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -24,6 +25,7 @@ import javax.validation.constraints.NotBlank;
  * @author liquidnet
  * @since 2022-04-08
  */
+@ApiModel(value = "GoblinGoodsAnticipateParam", description = "创建关联sku和spu表")
 @Data
 public class GoblinGoodsAnticipateValueAddParam {
 
@@ -32,28 +34,28 @@ public class GoblinGoodsAnticipateValueAddParam {
     /**
      * sku名称
      */
-    @ApiModelProperty(value = "sku名称")
+    @ApiModelProperty(required = true,value = "sku名称")
     @NotBlank(message = "skuName不能为空")
     private String skuName;
 
     /**
      * sku_id 对应 goblin_goods_sku.sku_id
      */
-    @ApiModelProperty(value = "sku_id 对应 goblin_goods_sku.sku_id")
+    @ApiModelProperty(required = true,value = "sku_id 对应 goblin_goods_sku.sku_id")
     @NotBlank(message = "skuId不能为空")
     private String skuId;
 
     /**
      * spu_id对应 goblin_goods_spu_id
      */
-    @ApiModelProperty(value = "spu_id对应 goblin_goods_spu_id")
+    @ApiModelProperty(required = true,value = "spu_id对应 goblin_goods_spu_id")
     @NotBlank(message = "spuId不能为空")
     private String spuId;
 
     /**
      * 预约开始时间
      */
-    @ApiModelProperty(value = "预约开始时间")
+    @ApiModelProperty(required = true,value = "预约开始时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @NotBlank(message = "预约开始时间不能为空")
     private LocalDateTime aboutStartDate;
@@ -61,7 +63,7 @@ public class GoblinGoodsAnticipateValueAddParam {
     /**
      * 预约结束时间
      */
-    @ApiModelProperty(value = "预约结束时间")
+    @ApiModelProperty(required = true,value = "预约结束时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @NotBlank(message = "预约结束时间不能为空")
     private LocalDateTime aboutEndDate;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinGoodsAnticipateValueParam.java

@@ -20,9 +20,9 @@ import java.time.LocalDateTime;
  * @author liquidnet
  * @since 2022-04-07
  */
-@ApiModel(value = "GoblinGoodsAnticipateValueParam", description = "预约")
+@ApiModel(value = "GoblinGoodsAnticipateValueParam", description = "获取预约")
 @Data
-public class GoblinGoodsAnticipateValueParam{
+public class GoblinGoodsAnticipateValueParam {
 
     @ApiModelProperty(position = 11, required = true, value = "当前记录起始索引", example = "1")
     @Min(value = 1, message = "起始索引无效")
@@ -54,4 +54,8 @@ public class GoblinGoodsAnticipateValueParam{
     @ApiModelProperty(position = 18, required = false, value = "创建日期")
     private String createdDate;
 
+    @ApiModelProperty(value = "预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+
+
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSkuArActionParam.java

+package com.liquidnet.service.goblin.dto.manage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "GoblinStoreMgtGoodsSkuArActionParam", description = "商品管理:藏品AR:管理（删除...）")
+@Data
+public class GoblinStoreMgtGoodsSkuArActionParam implements Serializable {
+    private static final long serialVersionUID = 3193592471744574048L;
+    @ApiModelProperty(position = 10, required = true, value = "店铺ID")
+    @NotBlank(message = "店铺ID不能为空")
+    private String storeId;
+    @ApiModelProperty(position = 11, required = true, value = "操作类型[REMOVE-删除]")
+    @Pattern(regexp = "\\b(REMOVE)\\b", message = "操作类型无效")
+    private String action;
+    @ApiModelProperty(position = 12, required = true, value = "单品ID列表")
+    private List<String> skuIdList;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSkuArAddParam.java

+package com.liquidnet.service.goblin.dto.manage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreMgtGoodsSkuArAddParam", description = "商品管理:藏品AR:新增入参")
+@Data
+public class GoblinStoreMgtGoodsSkuArAddParam implements Serializable {
+    private static final long serialVersionUID = -6002785025793722474L;
+    @ApiModelProperty(position = 10, required = true, value = "店铺ID")
+    @NotNull(message = "店铺ID不能为空")
+    private String storeId;
+    @ApiModelProperty(position = 11, required = true, value = "单品ID")
+    @NotNull(message = "单品ID不能为空")
+    private String skuId;
+    @ApiModelProperty(position = 12, required = true, value = "单品AR文件URL-iOS版[256]")
+    @NotNull(message = "iOS文件不能为空")
+    private String arUrlIos;
+    @ApiModelProperty(position = 13, required = true, value = "单品AR文件URL-android版[256]")
+    @NotNull(message = "android文件不能为空")
+    private String arUrlAndroid;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSkuArFilterParam.java

+package com.liquidnet.service.goblin.dto.manage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.*;
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreMgtGoodsSkuExtraFilterParam", description = "商品管理:藏品AR:列表筛选条件")
+@Data
+public class GoblinStoreMgtGoodsSkuArFilterParam implements Serializable {
+    private static final long serialVersionUID = -8520107197264504640L;
+    @ApiModelProperty(position = 10, required = true, value = "店铺ID[64]")
+    @NotBlank(message = "店铺ID不能为空")
+    private String storeId;
+    @ApiModelProperty(position = 11, required = true, value = "当前记录起始索引", example = "1")
+    @Min(value = 1, message = "起始索引无效")
+    @NotNull(message = "起始索引无效")
+    private Integer pageNum;
+    @ApiModelProperty(position = 12, required = true, value = "每页显示记录数", example = "20")
+    @Min(value = 1, message = "显示记录数不能小于1")
+    @Max(value = 100, message = "显示记录数不能大于100")
+    @NotNull(message = "显示记录数不能为空")
+    private Integer pageSize;
+    @ApiModelProperty(position = 13, required = false, value = "搜索关键字[128]")
+    @Size(min = 2, max = 100, message = "搜索关键字长度范围2~100")
+    private String keyword;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSkuFilterParam.java

@@ -23,7 +23,9 @@ public class GoblinStoreMgtGoodsSkuFilterParam implements Serializable {
     private Integer pageNum;
     @ApiModelProperty(position = 13, required = false, value = "搜索关键字[128]")
     private String keyword;
-    @ApiModelProperty(position = 14, required = false, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架]", allowableValues = "0,1,2,3")
+    @ApiModelProperty(position = 14, required = false, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架|4-已上架未开售]", allowableValues = "0,1,2,3")
     private String shelvesStatus;
+    @ApiModelProperty(position = 15, required = false, value = "类型[0-普通|1-分批购]")
+    private Integer type;
 
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSkuSimpleFilterParam.java

+package com.liquidnet.service.goblin.dto.manage;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreMgtGoodsSkuSimpleFilterParam", description = "商品管理:SKU列表筛选条件入参")
+@Data
+public class GoblinStoreMgtGoodsSkuSimpleFilterParam implements Serializable {
+    private static final long serialVersionUID = -2875361058424448491L;
+    @ApiModelProperty(position = 10, required = true, value = "店铺ID[64]")
+    @NotBlank(message = "店铺ID不能为空")
+    private String storeId;
+    @ApiModelProperty(position = 11, required = true, value = "当前记录起始索引", example = "1")
+    @Min(value = 1, message = "起始索引不能小于1")
+    @NotNull(message = "起始索引无效")
+    private Integer pageNum;
+    @ApiModelProperty(position = 13, required = false, value = "搜索关键字[128]")
+    @Size(min = 2, max = 100, message = "搜索关键字长度范围2~100")
+    private String keyword;
+    @ApiModelProperty(position = 14, required = false, value = "商品类型[0-常规|1-数字藏品]，未指定则代表全部")
+    private Integer skuType;
+//    @ApiModelProperty(position = 15, required = false, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架]", allowableValues = "0,1,2,3")
+//    private String shelvesStatus;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/AnticipateValueVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.goblin.dto.manage.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftGoodsSkuListVo;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,6 +20,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2022-04-08
  */
+@ApiModel(value = "AnticipateValueVo", description = "预约关联sku和spu表")
 @Data
 public class AnticipateValueVo implements Cloneable {
 
@@ -36,6 +38,10 @@ public class AnticipateValueVo implements Cloneable {
     private String rule;
     @ApiModelProperty("预约人数")
     private BigInteger aboutPeople;
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+    @ApiModelProperty("设置预约人数")
+    private Integer peopleType;
     @ApiModelProperty("前三预约头像")
     private List<String> aboutAvatarList;
 
@@ -55,6 +61,8 @@ public class AnticipateValueVo implements Cloneable {
         this.setAboutStartDate(source.getAboutStartDate());
         this.setAboutEndDate(source.getAboutEndDate());
         this.setState(source.getState());
+        this.setType(source.getType());
+        this.setPeopleType(source.getPeopleType());
         return this;
     }
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinGoodsAnticipateValueVo.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
  * @since 2022-04-08
  */
 @Data
-public class GoblinGoodsAnticipateValueVo implements Cloneable{
+public class GoblinGoodsAnticipateValueVo implements Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -97,6 +97,10 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{
      */
     @ApiModelProperty(value = "删除（0:未删除1:已删除）")
     private Integer delTag;
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+    @ApiModelProperty("设置预约人数")
+    private Integer peopleType;
 
     private static final GoblinGoodsAnticipateValueVo obj = new GoblinGoodsAnticipateValueVo();
 
@@ -119,5 +123,4 @@ public class GoblinGoodsAnticipateValueVo implements Cloneable{
     }
 
 
-
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreMgtGoodsSkuArListVo.java

+package com.liquidnet.service.goblin.dto.manage.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreMgtGoodsSkuArListVo", description = "商品管理:藏品AR列表信息")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinStoreMgtGoodsSkuArListVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -6629148859241936997L;
+    @ApiModelProperty(position = 10, value = "商品单品ID")
+    private String skuId;
+    @ApiModelProperty(position = 11, value = "单品的名称[100]")
+    private String name;
+    @ApiModelProperty(position = 12, value = "单品的副标题[128]")
+    private String subtitle;
+    @ApiModelProperty(position = 13, value = "单品AR文件URL-iOS版[256]")
+    private String arUrlIos;
+    @ApiModelProperty(position = 14, value = "单品AR文件URL-android版[256]")
+    private String arUrlAndroid;
+
+    private static final GoblinStoreMgtGoodsSkuArListVo obj = new GoblinStoreMgtGoodsSkuArListVo();
+
+    public static GoblinStoreMgtGoodsSkuArListVo getNew() {
+        try {
+            return (GoblinStoreMgtGoodsSkuArListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreMgtGoodsSkuArListVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreMgtGoodsSkuListVo.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @ApiModel(value = "GoblinStoreMgtGoodsSkuListVo", description = "商品管理:商品款式信息")
@@ -37,7 +38,18 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
     private LocalDateTime saleStopTime;
     @ApiModelProperty(position = 33, value = "是否盲盒[0-否|1-是]")
     private String unbox;
-
+    @ApiModelProperty(position = 34, value = "是否隐藏[0-默认展示|1-隐藏]")
+    private String skuAppear;
+    @ApiModelProperty(position = 35, value = "是否售罄[0-否|1-是]")
+    private String soldoutStatus;
+    @ApiModelProperty(position = 36, value = "是否购买[0-否|1-是]")
+    private String skuCanbuy;
+    @ApiModelProperty(position = 37, value = "NFT上传声明状态[0-待上传|1-已声明|2-声明失败|9-声明中]")
+    private Integer upchain;
+    @ApiModelProperty(position = 38, value = "盲盒命中率")
+    private BigDecimal hitRatio;
+    @ApiModelProperty(position = 39, value = "系统时间")
+    private String sysTime;
 
     public String getSaleStartTime() {
         return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStartTime);
@@ -70,6 +82,11 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
         this.setSaleStartTime(source.getSaleStartTime());
         this.setSaleStopTime(source.getSaleStopTime());
         this.setUnbox(source.getUnbox());
+        this.setUpchain(source.getUpchain());
+        this.setSkuAppear(source.getSkuAppear());
+        this.setSkuCanbuy(source.getSkuCanbuy());
+        this.setSoldoutStatus(source.getSoldoutStatus());
+        this.setHitRatio(source.getHitRatio());
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinStoreMgtGoodsSkuSimpleVo.java

+package com.liquidnet.service.goblin.dto.manage.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@ApiModel(value = "GoblinStoreMgtGoodsSkuSimpleVo", description = "商品管理:SKU列表（简版）")
+@Data
+public class GoblinStoreMgtGoodsSkuSimpleVo implements Serializable {
+    private static final long serialVersionUID = 7389835893135307728L;
+    @ApiModelProperty(position = 10, value = "商品ID[64]")
+    private String spuId;
+    @ApiModelProperty(position = 11, value = "单品ID[64]")
+    private String skuId;
+    @ApiModelProperty(position = 12, value = "商品类型[0-常规|1-数字藏品]")
+    private int skuType;
+    @ApiModelProperty(position = 13, value = "单品名称[100]")
+    private String name;
+    @ApiModelProperty(position = 14, value = "单品副标题[100]")
+    private String subtitle;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/HelpValueVo.java

+package com.liquidnet.service.goblin.dto.manage.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsAnticipateShareVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author TT
+ */
+@Data
+@ApiModel(value = "HelpValueVo", description = "根据sid查询助力信息")
+public class HelpValueVo implements java.io.Serializable, Cloneable{
+
+    @ApiModelProperty(value = "助力头像前六个")
+    private List<String> helpUserAvatar;
+
+    @ApiModelProperty(value = "目前有多少助力")
+    private Integer helpPeople;
+
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+
+    @ApiModelProperty("设置预约人数")
+    private Integer peopleType;
+
+    @ApiModelProperty("skuId")
+    private String skuId;
+
+    @ApiModelProperty("发起助力头像")
+    private String avatar;
+
+    @ApiModelProperty("发起人昵称")
+    private String nickname;
+
+    /**
+     * 预约开始时间
+     */
+    @ApiModelProperty(value = "预约开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime aboutStartDate;
+
+    /**
+     * 预约结束时间
+     */
+    @ApiModelProperty(value = "预约结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime aboutEndDate;
+
+    private static final HelpValueVo obj = new HelpValueVo();
+    public static HelpValueVo getNew() {
+        try {
+            return (HelpValueVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new HelpValueVo();
+        }
+    }
+
+    public HelpValueVo copy(GoblinGoodsAnticipateShareVo shareVo){
+        if(shareVo == null) return this;
+        this.setType(shareVo.getType());
+        this.setPeopleType(shareVo.getPeopleType());
+        this.setSkuId(shareVo.getSkuId());
+        this.setHelpUserAvatar(shareVo.getAvatarImgList());
+        this.setNickname(shareVo.getNickname());
+        this.setAvatar(shareVo.getAvatar());
+        this.setHelpPeople(shareVo.getHelpPeople());
+        this.setAboutStartDate(shareVo.getAboutStartDate());
+        this.setAboutEndDate(shareVo.getAboutEndDate());
+        return this;
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/ActivityExcelVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+@Data
+@HeadRowHeight(value = 20)//设置表头行高
+@ColumnWidth(value = 15)//设置表头行宽
+public class ActivityExcelVo {
+
+    /**
+     * 活动标题
+     */
+    @ExcelProperty(value = "活动标题", index = 0)
+    private String title;
+
+    @ExcelProperty(value = "时间", index = 1)
+    private String excelTime;
+
+
+    /**
+     * 总数量
+     */
+    @ExcelProperty(value = "兑换码数量", index = 2)
+    private Integer countNumber;
+
+    /**
+     * 使用数量
+     */
+    @ExcelProperty(value = "已兑换", index = 3)
+    private Integer useNumber;
+
+    /**
+     * 未使用数量
+     */
+    @ExcelProperty(value = "未兑换", index = 4)
+    private Integer unUseNumber;
+
+    private  final  static ActivityExcelVo obj = new ActivityExcelVo();
+
+    public static ActivityExcelVo getNew(){
+        try {
+            return  (ActivityExcelVo) obj.clone();
+        }catch (CloneNotSupportedException e){
+            return new ActivityExcelVo();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/CodeExcelVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+@Data
+@HeadRowHeight(value = 20)//设置表头行高
+@ColumnWidth(value = 15)//设置表头行宽
+public class CodeExcelVo {
+
+    @ExcelProperty(value = "兑换码", index = 0)
+    private String code;
+
+    @ExcelProperty(value = "藏品名称", index = 1)
+    private String skuName;
+
+    @ExcelProperty(value = "兑换开始时间", index = 2)
+    private String excelStartTime;
+
+    @ExcelProperty(value = "兑换结束时间", index = 3)
+    private String excelStopTime;
+
+    @ExcelProperty(value = "用户id", index = 4)
+    private String redeemUid;
+
+    @ExcelProperty(value = "状态", index = 5)
+    private String state;
+
+    private static final CodeExcelVo obj = new CodeExcelVo();
+
+    public static CodeExcelVo getNew() {
+        try {
+            return (CodeExcelVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CodeExcelVo();
+        }
+    }
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsAnticipateHelp.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author TT
+ */
+@Data
+public class GoblinGoodsAnticipateHelp implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * skuId
+     */
+    @ApiModelProperty("skuId")
+    private String skuId;
+
+    /**
+     * 预约类型
+     */
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+
+    /**
+     * 配置预约人数
+     */
+    @ApiModelProperty("配置预约人数")
+    private Integer people;
+
+    /**
+     * 预约开始时间
+     */
+    @ApiModelProperty(value = "预约开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime aboutStartDate;
+
+    /**
+     * 预约结束时间
+     */
+    @ApiModelProperty(value = "预约结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime aboutEndDate;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    private static final GoblinGoodsAnticipateHelp obj = new GoblinGoodsAnticipateHelp();
+
+    public static GoblinGoodsAnticipateHelp getNew() {
+        try {
+            return (GoblinGoodsAnticipateHelp) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsAnticipateHelp();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsAnticipateHelpVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @author TT
+ */
+@Data
+public class GoblinGoodsAnticipateHelpVo implements Serializable,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String sid;
+
+    /**
+     * 分享用户id
+     */
+//    private String uid;
+
+    /**
+     * 助力人uid
+     */
+    private String helpUid;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 头像集合
+     */
+//    private List<String> helpUserAvatar;
+
+    private static final GoblinGoodsAnticipateHelpVo obj = new GoblinGoodsAnticipateHelpVo();
+
+    public static GoblinGoodsAnticipateHelpVo getNew() {
+        try {
+            return (GoblinGoodsAnticipateHelpVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsAnticipateHelpVo();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsAnticipateShareVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.manage.vo.HelpValueVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+
+/**
+ * @author TT
+ */
+@Data
+public class GoblinGoodsAnticipateShareVo  implements Serializable,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    private String sid;
+
+    /**
+     * 用户uid
+     */
+    private String uid;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * sku_Id
+     */
+    private String skuId;
+
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+
+    @ApiModelProperty("设置预约人数")
+    private Integer peopleType;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 助力人数
+     */
+    @ApiModelProperty(value = "目前有多少助力")
+    private Integer helpPeople;
+
+    /**
+     * 预约开始时间
+     */
+    @ApiModelProperty(value = "预约开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime aboutStartDate;
+
+    /**
+     * 预约结束时间
+     */
+    @ApiModelProperty(value = "预约结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    private LocalDateTime aboutEndDate;
+
+    /**
+     * 创建时
+     */
+    private LocalDateTime createdDate;
+
+    /**
+     * 头像集合
+     */
+    private List<String> avatarImgList;
+
+
+    private static final GoblinGoodsAnticipateShareVo obj = new GoblinGoodsAnticipateShareVo();
+
+    public static GoblinGoodsAnticipateShareVo getNew() {
+        try {
+            return (GoblinGoodsAnticipateShareVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsAnticipateShareVo();
+        }
+    }
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsAnticipateVo.java

@@ -33,11 +33,28 @@ public class GoblinGoodsAnticipateVo implements Serializable,Cloneable {
      */
     private String id;
 
+    /**
+     * 预约名称
+     */
+//    private String name;
+
     /**
      * ant_id
      */
     private String antId;
 
+    /**
+     * 配置人数
+     */
+    @ApiModelProperty(value = "预约人数（达到一定人数可以预约）")
+    private Integer people;
+
+    /**
+     * 类型标识
+     */
+    @ApiModelProperty(value = "预约类型（1：预约提醒，2：预约获得购买资格）")
+    private int type;
+
     /**
      * 预约规则
      */
@@ -71,6 +88,8 @@ public class GoblinGoodsAnticipateVo implements Serializable,Cloneable {
 
     public GoblinGoodsAnticipateVo copy(GoblinGoodsAnticipateAddParam goodsAnticipateAddParam) {
         if (null==goodsAnticipateAddParam) return this;
+        this.people = goodsAnticipateAddParam.getPeople();
+        this.type = goodsAnticipateAddParam.getType();
         this.setRule(goodsAnticipateAddParam.getRule());
         return this;
     }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsInfoListVoo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@ApiModel(value = "GoblinGoodsInfoListVo", description = "商品SPU List")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinGoodsInfoListVoo implements Serializable, Cloneable {
+   private List<GoblinGoodsInfoListVo> list;
+    @ApiModelProperty(position = 55, value = "数量")
+    private long count;
+    private static final GoblinGoodsInfoListVoo obj = new GoblinGoodsInfoListVoo();
+
+    public static GoblinGoodsInfoListVoo getNew() {
+        try {
+            return (GoblinGoodsInfoListVoo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinGoodsInfoListVoo();
+        }
+    }
+/*    public int compareTo(GoblinGoodsInfoVo arg0) {
+        return this.getCount().compareTo(arg0.getCount());
+    }*/
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinGoodsSkuInfoVo.java

@@ -147,9 +147,14 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime deletedAt;
 
+    @ApiModelProperty(position = 40, value = "单品AR文件URL-iOS版")
+    private String arUrlIos;
+    @ApiModelProperty(position = 40, value = "单品AR文件URL-android版")
+    private String arUrlAndroid;
+
     @ApiModelProperty(position = 40, value = "单品规格信息")
     private List<GoblinGoodsSpecDto> skuSpecList;
-    @ApiModelProperty(position = 54, value = "单品音乐人标签[藏品类型时使用]")
+    @ApiModelProperty(position = 41, value = "单品音乐人标签[藏品类型时使用]")
     private List<GoblinGoodsExtagVo> extagVoList;
 
     /* -------------------------------- 只展示，不存储 -------------------------------- */

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinListCollectVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class GoblinListCollectVo implements Serializable, Cloneable{
+    @ApiModelProperty(value = "listId")
+    private String listId;
+    @ApiModelProperty(value = "spuId")
+    private String spuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuId;
+    @ApiModelProperty(value = "标签[0-提前购买|1-分段购买]")
+    private Integer tagType;
+    @ApiModelProperty(value = "android价格")
+    private BigDecimal price;
+    @ApiModelProperty(value = "苹果价格")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "苹果价格id")
+    private String productId;
+    @ApiModelProperty(value = "优先购类型[0-会员|1-指定用户]")
+    private Integer whiteType;
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private LocalDateTime timeEnd;
+
+    private static final GoblinListCollectVo obj = new GoblinListCollectVo();
+
+    public static GoblinListCollectVo getNew() {
+        try {
+            return (GoblinListCollectVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinListCollectVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinListDetailsItemVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class GoblinListDetailsItemVo implements Serializable, Cloneable{
+    @ApiModelProperty(value = "spuId")
+    private String spuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuId;
+    @ApiModelProperty(value = "sku名称")
+    private String skuName;
+    @ApiModelProperty(value = "剩余库存")
+    private Integer surplusStock;
+
+    @ApiModelProperty(value = "android价格")
+    private BigDecimal price;
+    @ApiModelProperty(value = "库存")
+    private Integer skuStock;
+    @ApiModelProperty(value = "苹果价格")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "苹果价格id")
+    private String productId;
+
+    private static final GoblinListDetailsItemVo obj = new GoblinListDetailsItemVo();
+
+    public static GoblinListDetailsItemVo getNew() {
+        try {
+            return (GoblinListDetailsItemVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinListDetailsItemVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinListDetailsVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+public class GoblinListDetailsVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "名单id")
+    private String listId;
+    @ApiModelProperty(value = "用户id")
+    private String uid;
+    @ApiModelProperty(value = "优先购名称")
+    private String name;
+    @ApiModelProperty(value = "优先购类型[0-会员|1-指定用户]")
+    private Integer whiteType;
+    @ApiModelProperty(value = "优先购文件地址")
+    private String whiteUrl;
+
+    @ApiModelProperty(value = "标签[0-提前购买|1-分段购买]")
+    private Integer tagType;
+    @ApiModelProperty(value = "开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+
+    @ApiModelProperty(value = "黑名单文件地址")
+    private String blackUrl;
+    @ApiModelProperty(value = "商品数据")
+    private List<GoblinListDetailsItemVo> itemVo;
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+
+    @ApiModelProperty(value = "白名单文件名称")
+    private String whiteName;
+    @ApiModelProperty(value = "黑名单文件名称")
+    private String blackName;
+
+    private static final GoblinListDetailsVo obj = new GoblinListDetailsVo();
+
+    public static GoblinListDetailsVo getNew() {
+        try {
+            return (GoblinListDetailsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinListDetailsVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinListVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class GoblinListVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "名单id")
+    private String listId;
+    @ApiModelProperty(value = "优先购名称")
+    private String name;
+    @ApiModelProperty(value = "开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "是否有黑名单[1-有|2-无]")
+    private Integer hasBlack;
+    @ApiModelProperty(value = "商品数量")
+    private Integer skuCount;
+
+    private static final GoblinListVo obj = new GoblinListVo();
+
+    public static GoblinListVo getNew() {
+        try {
+            return (GoblinListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new GoblinListVo();
+    }
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExActivityVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.entity.GoblinGoods;
+import com.liquidnet.service.goblin.entity.GoblinNftExActivity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * @Author: wll
+ * @Description: nft 兑换活动表
+ * @Date:Create：in 2022/4/19 2:14 下午
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinNftExActivityVo implements Serializable, Cloneable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+
+    /**
+     * 活动id
+     */
+    @ApiModelProperty(position = 10, required = true, value = "活动id")
+    private String activityId;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(position = 11, required = true, value = "用户id")
+    private String uid;
+
+    /**
+     * 活动标题
+     */
+    @ExcelProperty(value = "活动标题", index = 0)//”0“表示excel中的第一列
+    @ApiModelProperty(position = 12, required = true, value = "活动标题")
+    private String title;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 13, required = true, value = "创建时间")
+    private LocalDateTime createdAt;
+
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 14, required = true, value = "更新时间")
+    private LocalDateTime updatedAt;
+
+    /**
+     * 总数量
+     */
+    @ExcelProperty(value = "优惠券总数量", index = 2)//”0“表示excel中的第一列
+    @ApiModelProperty(position = 15, required = true, value = "总数量")
+    private Integer countNumber;
+
+    /**
+     * 使用数量
+     */
+    @ExcelProperty(value = "优惠券使用数量", index = 3)//”0“表示excel中的第一列
+    @ApiModelProperty(position = 16, required = true, value = "使用数量")
+    private Integer useNumber;
+
+    /**
+     * 未使用数量
+     */
+    @ExcelProperty(value = "兑换码未使用数量", index = 4)//”0“表示excel中的第一列
+    @ApiModelProperty(position = 17, required = true, value = "未使用数量")
+    private Integer unUseNumber;
+
+
+    /**
+     * 是否展示生效中
+     */
+    @ApiModelProperty(position = 18, required = true, value = "是否展示生效中 0：否  1：是")
+    private Integer isDisplay;
+
+    /**
+     * 是否展示延期按钮
+     */
+    @ApiModelProperty(position = 19, required = true, value = "是否展示延期按钮 0不展示 1展示")
+    private Integer isDelay;
+
+
+    private final static GoblinNftExActivityVo obj = new GoblinNftExActivityVo();
+
+    public static GoblinNftExActivityVo getNew() {
+        try {
+            return (GoblinNftExActivityVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinNftExActivityVo();
+        }
+    }
+
+    public GoblinNftExActivityVo copy(GoblinNftExActivity goblinNftExActivity) {
+        if (null == goblinNftExActivity) return this;
+        this.setActivityId(goblinNftExActivity.getActivityId());
+        this.setUid(goblinNftExActivity.getUid());
+        this.setTitle(goblinNftExActivity.getTitle());
+        this.setCreatedAt(goblinNftExActivity.getCreatedAt());
+        this.setUpdatedAt(goblinNftExActivity.getUpdatedAt());
+        this.setCountNumber(goblinNftExActivity.getCountNumber());
+        this.setUseNumber(goblinNftExActivity.getUseNumber());
+        this.setUnUseNumber(goblinNftExActivity.getUnUseNumber());
+        this.setIsDisplay(goblinNftExActivity.getIsDisplay());
+        return this;
+    }
+
+}
+
+

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExCodeFetchExcelVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class GoblinNftExCodeFetchExcelVo {
+    @ExcelProperty(index = 0,value = "手机号")
+    String phone;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExCodeVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.entity.GoblinNftExCode;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: wll
+ * @Description: NFT兑换码表
+ * @Date:Create：in 2022/4/19 1:55 下午
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@HeadRowHeight(value = 20)//设置表头行高
+@ColumnWidth(value = 15)//设置表头行宽
+public class GoblinNftExCodeVo implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+
+    /**
+     * 兑换码id
+     */
+    @ApiModelProperty(position = 10,required = true,value ="兑换码id")
+    private String codeId;
+
+    /**
+     * 活动id
+     */
+    @ApiModelProperty(position = 11,required = true,value ="活动id")
+    private String activityId;
+
+
+    /**
+     * 兑换码
+     */
+
+    @ApiModelProperty(position = 12,required = true,value ="兑换码")
+    private String code;
+
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(position = 13,required = true,value ="商品id")
+    private String spuId;
+
+    /**
+     * 款式id
+     */
+    @ApiModelProperty(position = 14,required = true,value ="产品id")
+    private String skuId;
+
+    /**
+     * 盲盒抽取的款式id
+     */
+    @ApiModelProperty(position = 15,required = true,value ="盲盒抽取的款式id")
+    private String boxSkuId;
+
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty(position = 16,required = true,value ="店铺id")
+    private String storeId;
+
+
+    /**
+     * 兑换码状态 1 未兑换  2  已兑换
+     */
+
+    @ApiModelProperty(position = 17,required = true,value ="兑换码状态 1 未兑换  2  已兑换")
+    private Integer state;
+
+
+    /**
+     * 兑换用户id
+     */
+
+    @ApiModelProperty(position = 18,required = true,value ="兑换用户id")
+    private String redeemUid;
+
+    /**
+     * 操作用户id
+     */
+    @ApiModelProperty(position = 19,required = true,value ="操作用户id")
+    private String adminUid;
+
+
+    /**
+     * 兑换时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 20,required = true,value ="兑换时间")
+    private LocalDateTime redeemAt;
+
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(position = 21,required = true,value ="创建时间")
+    private LocalDateTime createdAt;
+
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(position = 22,required = true,value ="更新时间")
+    private LocalDateTime updatedAt;
+
+    /**
+     * 兑换限购
+     */
+    @ApiModelProperty(position = 23,required = true,value ="兑换限购")
+    private Integer exLimit;
+
+
+    /**
+     * 兑换生效开始时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 24,required = true,value ="兑换生效开始时间")
+    private LocalDateTime exStartTime;
+
+
+    /**
+     * 兑换生效结束时间
+     */
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 25,required = true,value ="兑换生效结束时间")
+    private LocalDateTime exStopTime;
+
+    /**
+     * sku名称
+     */
+    @ApiModelProperty(position = 26,required = true,value ="sku名称")
+    private String skuName;
+    /**
+     * 兑换结果sku名称
+     */
+    @ApiModelProperty(position = 27,required = true,value = "兑换结果sku名称")
+    private String resultSkuName;
+
+
+    /**
+     * 是否盲和
+     */
+    private String unBox;
+
+
+
+    private static final GoblinNftExCodeVo obj = new GoblinNftExCodeVo();
+
+    public static GoblinNftExCodeVo getNew() {
+        try {
+            return (GoblinNftExCodeVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinNftExCodeVo();
+        }
+    }
+
+    public GoblinNftExCodeVo copy(GoblinNftExCode goblinNftExCode){
+        if (null == goblinNftExCode)return this;
+        this.setCodeId(goblinNftExCode.getCodeId());
+        this.setActivityId(goblinNftExCode.getActivityId());
+        this.setCode(goblinNftExCode.getCode());
+        this.setSkuId(goblinNftExCode.getSkuId());
+        this.setState(goblinNftExCode.getState());
+        this.setBoxSkuId(goblinNftExCode.getBoxSkuId());
+        this.setRedeemUid(goblinNftExCode.getRedeemUid());
+        this.setAdminUid(goblinNftExCode.getAdminUid());
+        this.setRedeemAt(goblinNftExCode.getRedeemAt());
+        this.setCreatedAt(goblinNftExCode.getCreatedAt());
+        this.setUpdatedAt(goblinNftExCode.getUpdatedAt());
+        return this;
+    }
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftExSkuVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.entity.GoblinNftExSku;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author: wll
+ * @Description:
+ * @Date:Create：in 2022/4/19 2:23 下午
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class GoblinNftExSkuVo {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+
+    /**
+     * 活动id
+     */
+    @ApiModelProperty(position = 10,required = true,value ="活动id")
+    private String activityId;
+
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(position = 11,required = true,value ="商品id")
+    private String spuId;
+
+
+    /**
+     * 款式id
+     */
+    @ApiModelProperty(position = 12,required = true,value ="款式id")
+    private String skuId;
+
+    /**
+     * 是否盲盒 0：否   1：是
+     */
+    @ApiModelProperty(position = 13,required = true,value ="是否盲盒 0：否   1：是")
+    private String unBox;
+
+    /**
+     * 店铺id
+     */
+    @ApiModelProperty(position = 14,required = true,value ="店铺id")
+    private String storeId;
+
+
+    /**
+     * 兑换库存
+     */
+    @ApiModelProperty(position = 15,required = true,value =" 兑换库存")
+    private Integer exStock;
+
+    /**
+     * 兑换限购
+     */
+    @ApiModelProperty(position = 16,required = true,value ="兑换限购")
+    private Integer exLimit;
+
+
+    /**
+     * 兑换生效开始时间
+     */
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 17,required = true,value ="兑换生效开始时间")
+    private LocalDateTime exStartTime;
+
+
+    /**
+     * 兑换生效结束时间
+     */
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 18,required = true,value ="兑换生效结束时间")
+    private LocalDateTime exStopTime;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 19,required = true,value ="创建时间")
+    private LocalDateTime createdAt;
+
+    /**
+     * 修改时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 20,required = true,value ="修改时间")
+    private LocalDateTime updatedAt;
+
+    // redis 覆盖暂时无用
+    private String rdStartTime;
+    private String rdStopTime;
+
+    private  static  final GoblinNftExSkuVo obj = new GoblinNftExSkuVo();
+
+    public  static GoblinNftExSkuVo getNew(){
+        try{
+           return  (GoblinNftExSkuVo) obj.clone();
+        }catch (CloneNotSupportedException e){
+            return new GoblinNftExSkuVo();
+        }
+    }
+
+
+
+    public GoblinNftExSkuVo copy(GoblinNftExSku goblinNftExSku){
+        if (null == goblinNftExSku) return this;
+        this.setActivityId(goblinNftExSku.getActivityId());
+        this.setSpuId(goblinNftExSku.getSpuId());
+        this.setSkuId(goblinNftExSku.getSkuId());
+        this.setUnBox(goblinNftExSku.getUnbox());
+        this.setStoreId(goblinNftExSku.getStoreId());
+        this.setExStock(goblinNftExSku.getExStock());
+        this.setExLimit(goblinNftExSku.getExLimit());
+        this.setExStartTime(goblinNftExSku.getExStartTime());
+        this.setExStopTime(goblinNftExSku.getExStopTime());
+        this.setCreatedAt(goblinNftExSku.getCreatedAt());
+        this.setUpdatedAt(goblinNftExSku.getUpdatedAt());
+        return this;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuInfoVo.java

@@ -86,6 +86,32 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     private BigInteger aboutPeople;
     @ApiModelProperty(position = 64, value = "前三预约头像")
     private List<String> aboutAvatarList;
+    @ApiModelProperty("预约类型（1：预约提醒，2：预约获得购买资格）")
+    private Integer type;
+    @ApiModelProperty("设置预约人数")
+    private Integer peopleType;
+
+    @ApiModelProperty(position = 65, value = "是否开启兑换 1未开启 2已开启")
+    private int isExchange;
+
+    @ApiModelProperty(position = 66, value = "待支付订单数量")
+    private int notPayNum;
+
+    @ApiModelProperty(position = 67, value = "单品AR文件URL-iOS版")
+    private String arUrlIos;
+    @ApiModelProperty(position = 68, value = "单品AR文件URL-Android版")
+    private String arUrlAndroid;
+
+    @ApiModelProperty(position = 69, value = "标签[0-提前购买|1-分段购买]")
+    private Integer tagType;
+    @ApiModelProperty(position = 70, value = "分批购活动id")
+    private String listId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 71, value = "sku正常开售时间")
+    private LocalDateTime baseSaleStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 72, value = "下个分段购开始时间，如果为null则没有")
+    private LocalDateTime nextSaleStartTime;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
 
@@ -122,11 +148,15 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
             if (anticipateValueVo.getAboutEndDate() != null) {
                 this.setAboutStartDate(DateUtil.Formatter.yyyyMMddHHmmss.format(anticipateValueVo.getAboutStartDate()));
             }
+            this.setType(anticipateValueVo.getType());
+            this.setPeopleType(anticipateValueVo.getPeopleType());
             this.setState(anticipateValueVo.getState());
             this.setRule(anticipateValueVo.getRule());
             this.setAboutPeople(anticipateValueVo.getAboutPeople());
             this.setAboutAvatarList(anticipateValueVo.getAboutAvatarList());
         }
+        this.setArUrlIos(source.getArUrlIos());
+        this.setArUrlAndroid(source.getArUrlAndroid());
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuListJobVo.java

@@ -21,6 +21,7 @@ public class GoblinNftGoodsSkuListJobVo implements Serializable {
     private String spuId;
     @ApiModelProperty(position = 16, value = "是否盲盒[0-否|1-是]")
     private String unbox;
+    private String listId;
 
     @ApiModelProperty(position = 27, value = "开售时间")
     private LocalDateTime saleStartTime;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftGoodsSkuListVo.java

@@ -50,6 +50,8 @@ public class GoblinNftGoodsSkuListVo implements Serializable, Cloneable {
     private String aboutEndDate;
     @ApiModelProperty(position = 61, value = "预约状态(0:未开始，1:可预约，3:已结束)")
     private Integer state;
+    @ApiModelProperty(position = 62, value = "标签[0-提前购买|1-分段购买]")
+    private Integer tagType;
 
     private static final GoblinNftGoodsSkuListVo obj = new GoblinNftGoodsSkuListVo();
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftOrderVo.java

@@ -61,6 +61,12 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "用户手机号")
     private String userMobile;
 
+    @ApiModelProperty(value = "分批购ID")
+    private String listId;
+
+    @ApiModelProperty(value = "兑换码")
+    private String exCode;
+
     @ApiModelProperty(value = "应付金额")
     private BigDecimal priceTotal;
 
@@ -150,6 +156,8 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
         this.setUserId(source.getUserId());
         this.setUserName(source.getUserName());
         this.setUserMobile(source.getUserMobile());
+        this.setListId(source.getListId());
+        this.setExCode(source.getExCode());
         this.setPriceTotal(source.getPriceTotal());
         this.setPriceCoupon(source.getPriceCoupon());
         this.setStorePriceCoupon(source.getStorePriceCoupon());

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinNftSkuVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.liquidnet.service.goblin.entity.GoblinGoods;
+import com.liquidnet.service.goblin.entity.GoblinGoodsSku;
+import com.liquidnet.service.goblin.entity.GoblinNftExActivity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: wll
+ * @Description:
+ * @Date:Create：in 2022/4/24 2:02 下午
+ */
+
+@ApiModel(value = "GoblinNftSkuVo", description = "单个活动下的sku]")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class GoblinNftSkuVo implements Serializable,Cloneable{
+
+    private String skuId;
+    private String spuName;
+    private String image;
+    /**
+     * 总数量
+     */
+    private Integer countNumber;
+
+    /**
+     * 使用数量
+     */
+    private Integer useNumber;
+
+    /**
+     * 未使用数量
+     */
+    private Integer unUseNumber;
+
+    private GoblinNftExSkuVo goblinNftExSkuVo;
+
+
+    private final static GoblinNftSkuVo obj = new GoblinNftSkuVo();
+    public static GoblinNftSkuVo getNew(){
+        try {
+            return  (GoblinNftSkuVo) obj.clone();
+        }catch (CloneNotSupportedException e){
+            return new GoblinNftSkuVo();
+        }
+    }
+
+    public GoblinNftSkuVo copy(GoblinGoodsSku goblinGoodsSku){
+        if (null == goblinGoodsSku){
+            return this;
+        }
+        this.setSkuId(goblinGoodsSku.getSkuId());
+        this.setSpuName(goblinGoodsSku.getName());
+        this.setImage(goblinGoodsSku.getSkuPic());
+        return this;
+    }
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinPayOrderDetailsVo.java

@@ -30,12 +30,15 @@ public class GoblinPayOrderDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 22, value = "IOS商品价格[20,2]")
     private BigDecimal priceV;
 
-    @ApiModelProperty(value = "商铺名称")
+    @ApiModelProperty(position = 23, value = "商铺名称")
     private String storeName;
 
-    @ApiModelProperty(position = 23, value = "数量")
+    @ApiModelProperty(position = 24, value = "数量")
     private Integer num;
 
+    @ApiModelProperty(position = 25, value = "分批、提前购 是否有购买权限 0没有 1有")
+    private Integer isListCanBuy;
+
     private static final GoblinPayOrderDetailsVo obj = new GoblinPayOrderDetailsVo();
 
     public static GoblinPayOrderDetailsVo getNew() {

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkInfoVo.java

@@ -31,9 +31,9 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 18, value = "藏品生成时间[yyyy-MM-dd HH:mm:ss]")
     private String generateTime;
 
-    @ApiModelProperty(position = 19, value = "获得方式[1-购买|2-兑换|3-赠送|5-受赠]")
+    @ApiModelProperty(position = 19, value = "获得方式[1-购买|2-兑换|3-赠送|5-受赠|31-空投赠送]")
     private Integer source;
-    @ApiModelProperty(position = 20, value = "藏品状态，根据`unbox`区分盲盒来判断[0-生成中/未开启|1-已生成/已开启|2-生成失败/开启失败]")
+    @ApiModelProperty(position = 20, value = "藏品状态，根据`unbox`区分盲盒来判断[0-生成中/未开启|1-已生成/已开启|2-生成失败/开启失败|5-待收取]")
     private Integer state;
     @ApiModelProperty(position = 21, value = "创作者")
     private String author;
@@ -42,6 +42,14 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 23, value = "藏品详情")
     private String details;
 
+    @ApiModelProperty(position = 24, value = "单品AR文件URL-iOS版")
+    private String arUrlIos;
+    @ApiModelProperty(position = 25, value = "单品AR文件URL-android版")
+    private String arUrlAndroid;
+
+    @ApiModelProperty(position = 26, value = "单品ID")
+    private String skuId;
+
     private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo();
 
     public static GoblinUserDigitalArtworkInfoVo getNew() {
@@ -66,6 +74,7 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
 //        this.setAuthor();
 //        this.setPublisher();
 //        this.setDetails();
+        this.setSkuId(source.getSkuId());
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkListVo.java

@@ -28,10 +28,10 @@ public class GoblinUserDigitalArtworkListVo implements Serializable, Cloneable {
     private Integer editionSn;
     @ApiModelProperty(position = 16, value = "藏品发行量")
     private Integer edition;
-    @ApiModelProperty(position = 17, value = "获得方式[1-购买|2-兑换|3-赠送|5-受赠]")
+    @ApiModelProperty(position = 17, value = "获得方式[1-购买|2-兑换|3-赠送|5-受赠|31-空投赠送]")
     private Integer source;
 
-    @ApiModelProperty(position = 18, value = "藏品状态，根据`unbox`区分盲盒来判断[0-生成中/未开启|1-已生成/已开启|2-生成失败/开启失败]")
+    @ApiModelProperty(position = 18, value = "藏品状态，根据`unbox`区分盲盒来判断[0-生成中/未开启|1-已生成/已开启|2-生成失败/开启失败|5-待收取]")
     private Integer state;
     @ApiModelProperty(position = 19, value = "藏品创建时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/HelpAvatarVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class HelpAvatarVo implements Serializable,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("助力头像（只显示前六个）")
+    private List<String> helpAvatars;
+
+    @ApiModelProperty("助力人数")
+    private Integer helpPeople;
+
+    private static final HelpAvatarVo obj = new HelpAvatarVo();
+
+    public static HelpAvatarVo getNew() {
+        try {
+            return (HelpAvatarVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new HelpAvatarVo();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/OrderMallOrderVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+@Data
+@HeadRowHeight(value = 20)//设置表头行高
+@ColumnWidth(value = 15)//设置表头行宽
+public class OrderMallOrderVo {
+    @ExcelProperty(value = "订单编号",index = 0)
+    private String orderCode;
+    @ExcelProperty(value = "购买人手机号",index = 1)
+    private String userMobile;
+    @ExcelProperty(value = "快递费",index = 2)
+    private String priceExpress;
+    @ExcelProperty(value = "平台券优惠金额",index = 3)
+    private String priceCoupon;
+    @ExcelProperty(value = "店铺券优惠金额",index = 4)
+    private String storePriceCoupon;
+    @ExcelProperty(value = "收货人",index = 5)
+    private String expressContacts;
+    @ExcelProperty(value = "收货人电话",index = 6)
+    private String expressPhone;
+    @ExcelProperty(value = "快递地址",index = 7)
+    private String expressDetailAddress;
+    @ExcelProperty(value = "支付方式",index = 8)
+    private String payType;
+    @ExcelProperty(value = "支付时间",index = 9)
+    private String payTime;
+    @ExcelProperty(value = "下单时间",index = 10)
+    private String createdAt;
+    @ExcelProperty(value = "快递公司",index = 11)
+    private String logisticsCompany;
+    @ExcelProperty(value = "物流单号",index = 12)
+    private String mailNo;
+    @ExcelProperty(value = "商品id1",index = 13)
+    private String spuId;
+    @ExcelProperty(value = "商品名1",index = 14)
+    private String name;
+    @ExcelProperty(value = "一级分类1",index = 15)
+    private String cate1Name;
+    @ExcelProperty(value = "二级分类1",index = 16)
+    private String cate2Name;
+    @ExcelProperty(value = "款式1",index = 17)
+    private String skuName;
+    @ExcelProperty(value = "数量1",index = 18)
+    private String num;
+    @ExcelProperty(value = "单价1",index = 19)
+    private String skuPrice;
+    @ExcelProperty(value = "价格1",index = 20)
+    private String skuPriceActual;
+    @ExcelProperty(value = "订单skuId1",index = 21)
+    private String orderSkuId;
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/PageInfoVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+
+@Data
+public class PageInfoVo {
+    /**
+     * 总个数
+     */
+    private int total;
+    private Object list;
+    private int skuNumber;
+
+    public PageInfoVo() {
+    }
+
+    private static final PageInfoVo obj = new PageInfoVo();
+
+    public static PageInfoVo getNew() {
+        try {
+            return (PageInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PageInfoVo();
+        }
+    }
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinListCreateItemParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Data
+public class GoblinListCreateItemParam {
+    @ApiModelProperty(value = "spuId",required = true)
+    @NotNull(message = "spuId不能为空")
+    private String spuId;
+    @ApiModelProperty(value = "skuId",required = true)
+    @NotNull(message = "skuId不能为空")
+    private String skuId;
+
+    @ApiModelProperty(value = "android价格",required = true)
+    @NotNull(message = "price不能为空")
+    private BigDecimal price;
+    @ApiModelProperty(value = "库存",required = true)
+    @NotNull(message = "库存不能为空")
+    private Integer skuStock;
+    @ApiModelProperty(value = "苹果价格",required = true)
+    @NotNull(message = "苹果价格不能为空")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "苹果价格id",required = true)
+    @NotNull(message = "苹果价格id不能为空")
+    private String productId;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinListCreateParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class GoblinListCreateParam {
+    @ApiModelProperty(value = "优先购名称",required = true)
+    @NotNull(message = "优先购名称不能为空")
+    private String name;
+    @ApiModelProperty(value = "优先购类型[0-会员|1-指定用户]",required = true)
+    @NotNull(message = "优先购类型不能为空")
+    private Integer whiteType;
+    @ApiModelProperty(value = "标签[0-提前购买|1-分段购买]",required = true)
+    @NotNull(message = "标签类型不能为空")
+    private Integer tagType;
+    @ApiModelProperty(value = "优先购文件地址")
+    private String whiteUrl;
+    @ApiModelProperty(value = "开始时间",required = true)
+    @NotNull(message = "开始时间不能为空")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "黑名单文件地址")
+    private String blackUrl;
+    @ApiModelProperty(value = "黑名单文件名称")
+    private String blackName;
+    @ApiModelProperty(value = "白名单文件名称")
+    private String whiteName;
+    @ApiModelProperty(value = "商品数据",required = true)
+    private List<GoblinListCreateItemParam> itemParams;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinListUpdateParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class GoblinListUpdateParam {
+    @ApiModelProperty(value = "名单id",required = true)
+    @NotNull(message = "名单id不能为空")
+    private String listId;
+    @ApiModelProperty(value = "优先购类型[0-会员|1-指定用户]",required = true)
+    @NotNull(message = "优先购类型不能为空")
+    private Integer whiteType;
+    @ApiModelProperty(value = "优先购文件地址")
+    private String whiteUrl;
+    @ApiModelProperty(value = "黑名单文件地址")
+    private String blackUrl;
+    @ApiModelProperty(value = "黑名单文件名称")
+    private String blackName;
+    @ApiModelProperty(value = "白名单文件名称")
+    private String whiteName;
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityDelayParam.java

+package com.liquidnet.service.goblin.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "GoblinNftExActivityDelayParam", description = "该活动下兑换码延期入参")
+@Data
+public class GoblinNftExActivityDelayParam implements Serializable {
+
+    private static final long serialVersionUID = 5608646910502058970L;
+
+    @ApiModelProperty(position = 10, required = true, value = "老的活动id")
+    @NotBlank(message = "老的活动i不能为空")
+    private String activityId;
+
+    @ApiModelProperty(position = 11, required = true, value = "活动标题", example = "")
+    @NotBlank(message = "活动标题不能为空")
+    private String title;
+
+    @ApiModelProperty(position = 12, required = true, value = "用户id", example = "")
+    @NotBlank(message = "用户id不能为空")
+    private String uid;
+
+    @ApiModelProperty(position = 12, required = true, value = "开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @NotNull(message = "开始时间不能为空")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(position = 13, required = true, value = "结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @NotNull(message = "结束时间不能为空")
+    private LocalDateTime endTime;
+
+}
+
+

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityParam.java

+package com.liquidnet.service.goblin.param;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "GoblinNftExActivityParam", description = "添加方法入参")
+@Data
+public class GoblinNftExActivityParam implements Serializable {
+
+    @ApiModelProperty(position = 10, required = false, value = "nft活动id")
+    private String activityId;
+
+    @ApiModelProperty(position = 11, required = true, value = "活动标题", example = "")
+    private String title;
+
+    @ApiModelProperty(position = 12, required = true, value = "用户id", example = "")
+    private String uid;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 12, required = false, value = "开始时间")
+    private LocalDateTime startTime;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 13, required = false, value = "结束时间")
+    private LocalDateTime endTime;
+
+    @ApiModelProperty(position = 14, required = true, value = "当前页(查询时传入)", example = "1")
+    private Integer pageNum;
+
+}
+
+

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExCodeParam.java

+package com.liquidnet.service.goblin.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author: wll
+ * @Description:
+ * @Date:Create：in 2022/4/20 5:12 下午
+ */
+@ApiModel(value = "GoblinNftExCodeParam",description = "查询方法入参")
+@Data
+public class GoblinNftExCodeParam implements Serializable {
+
+    @ApiModelProperty(position = 10,required = true,value = "活动id")
+    private String activityId;
+    @ApiModelProperty(position = 11,required = true,value = "当前页")
+    private Integer pageNum;
+    @ApiModelProperty(position = 12,required = false,value = "兑换码/发送空投时必传")
+    private String code;
+    @ApiModelProperty(position = 13,required = false,value = "兑换码状态  全部非传 1未兑换 2已兑换 3已失效")
+    private Integer state;
+    @ApiModelProperty(position = 14,required = false,value = "默认无参 1：明盒、盲盒 2：空投盲盒/空投明盒")
+    private Integer isDrivi;
+    @ApiModelProperty(position = 15,required = false,value = "藏品名称")
+    private String skuName;
+    @ApiModelProperty(position = 16,required = false,value = "用户id搜索")
+    private String userId;
+    @ApiModelProperty(position = 17,required = true,value = "手机号/ 发送空投时传入")
+    private String phone;
+    @ApiModelProperty(position = 18,required = true,value = "当操作用户id/发送空投时传入")
+    private String adminUid;
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExSkuParam.java

+package com.liquidnet.service.goblin.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Author: wll
+ * @Date:Create：in 2022/4/19 5:06 下午
+ */
+
+@ApiModel(value = "GoblinNftExActivityParam", description = "添加方法入参")
+@Data
+public class GoblinNftExSkuParam implements Serializable {
+
+
+    @ApiModelProperty(position = 10, required = true, value = "nft兑换活动id")
+    // @NotBlank(message = "nft兑换活动id不可为空")
+    private String activityId;
+
+    @ApiModelProperty(position = 11,required = true,value = "店铺id")
+    private String storeId;
+
+
+    @ApiModelProperty(position = 12,required = true,value = "商品id")
+    // @NotBlank(message = "商品id不可为空")
+    private String spuId;
+
+    @ApiModelProperty(position = 13,required = true,value = "款式id")
+    // @NotBlank(message = "款式id不可为空")
+    private String skuId;
+
+    @ApiModelProperty(position = 14,required = true,value = "是否盲盒 0：否 1：是")
+    // @NotBlank(message = "是否盲盒 0：否 1：是")
+    private String unbox;
+
+    @ApiModelProperty(position = 15,required = true,value = "兑换库存数量")
+    // @NotBlank(message = "兑换库存数量不可为空")
+    private Integer exStock;
+
+    @ApiModelProperty(position = 16,required = true,value = "兑换限购数量")
+    // @NotBlank(message = "兑换限购数量不可为空")
+    private Integer exLimit;
+
+    @ApiModelProperty(position = 17,required = true,value = "兑换生效开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    // @NotBlank(message = "兑换生效开始时间不可为空")
+    private LocalDateTime exStartTime;
+
+    @ApiModelProperty(position = 18,required = true,value = "兑换生效结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+   //  @NotBlank(message = "兑换生效结束时间不可为空")
+    private LocalDateTime exStopTime;
+
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftOrderPayParam.java

@@ -41,5 +41,15 @@ public class GoblinNftOrderPayParam {
     @ApiModelProperty(position = 17, value = "returnUrl 之前h5需要 app不需要再说")
     private String returnUrl;
 
+    private static final GoblinNftOrderPayParam obj = new GoblinNftOrderPayParam();
+
+    public static GoblinNftOrderPayParam getNew() {
+        try {
+            return (GoblinNftOrderPayParam) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinNftOrderPayParam();
+        }
+    }
+
 
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/admin/GoblinNftOrderListParam.java

@@ -39,4 +39,8 @@ public class GoblinNftOrderListParam {
     private String payTimeStart;
     @ApiModelProperty(value = "支付结束时间")
     private String payTimeEnd;
+    @ApiModelProperty(value = "兑换码")
+    private String exCode;
+    @ApiModelProperty(value = "用户手机号")
+    private String userMobile;
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/admin/GoblinNftOrderRefundListParam.java

@@ -35,4 +35,8 @@ public class GoblinNftOrderRefundListParam {
     private String payType;
     @ApiModelProperty(value = "订单状态")
     private Integer status;
+    @ApiModelProperty(value = "支付开始时间")
+    private String payTimeStart;
+    @ApiModelProperty(value = "支付结束时间")
+    private String payTimeEnd;
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinExportService.java

+package com.liquidnet.service.goblin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface IGoblinExportService {
+    //导出商城订单信息
+    ResponseDto<String> exportMallOrder(HttpServletResponse response, String beginTime, String endTime, String state, Integer mailType,String storeId);
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinGoodsAnticipateService.java

 package com.liquidnet.service.goblin.service;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.manage.vo.HelpValueVo;
 
 
 /**
@@ -14,10 +15,46 @@ import com.liquidnet.service.base.ResponseDto;
 public interface IGoblinGoodsAnticipateService {
 
     /**
-     * 用户预约
+     * 用户预约 （只能预约不能取消）
+     * @param skuId skuId
+     * @return Boolean
      */
-    ResponseDto<Object> userAbout(String skuId);
-
+    ResponseDto<Boolean> userAbout(String skuId);
 
+    /**
+     * 根据skuId查询是否预约
+     * @param skuId skuId
+     * @return Boolean
+     */
     ResponseDto<Boolean> selectAnticipate(String skuId);
+
+    /**
+     * 用户分享,根据sku发起助力
+     * @param skuId skuId
+     * @return 分享id
+     */
+    ResponseDto<String> share(String skuId);
+
+    /**
+     * 用户为他人助力
+     * @param sid 分享id
+     * @return Boolean
+     */
+    ResponseDto<String> help(String sid);
+
+    /**
+     * 获取当前助力信息
+     * @param sid 分享id
+     * @return 创建关联sku和spu表
+     */
+    ResponseDto<HelpValueVo> getHelpValue(String sid);
+
+    /**
+     * 是否开启助力(返回助力的sid,返回null则没有开启助力)
+     * @param skuId skuId
+     * @return 返回助力的sid,返回null则没有开启助力
+     */
+    ResponseDto<String> getTurnOnHelp(String skuId);
+
+    ResponseDto<Boolean> helpSid(String sid);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinImportService.java

+package com.liquidnet.service.goblin.service;
+
+
+import com.liquidnet.service.base.ResponseDto;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IGoblinImportService {
+    //导入对订单发货
+    ResponseDto<String> importExpress(MultipartFile file);
+
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExActivityService.java

+package com.liquidnet.service.goblin.service;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
+import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
+import com.liquidnet.service.goblin.param.GoblinNftExActivityDelayParam;
+import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+public interface IGoblinNftExActivityService {
+
+    /**
+     * 新增nft活动
+     *
+     * @param goblinNftExActivityParam
+     * @return
+     */
+    ResponseDto<Object> add(GoblinNftExActivityParam goblinNftExActivityParam);
+
+    /**
+     * 分页查询
+     *
+     * @param goblinNftExActivityParam
+     * @return
+     */
+    PageInfoVo pageList(GoblinNftExActivityParam goblinNftExActivityParam);
+
+    /**
+     * 根据活动id获取活动下商品
+     *
+     * @param activityId
+     * @return
+     */
+    List<GoblinNftSkuVo> selectNftSkuByActivityId(String activityId);
+
+    /**
+     * excel导出
+     *
+     * @param httpServletResponse
+     * @param goblinNftExActivityParam
+     */
+    void excel(HttpServletResponse httpServletResponse, GoblinNftExActivityParam goblinNftExActivityParam);
+
+    ResponseDto delay(GoblinNftExActivityDelayParam goblinNftExActivityDelayParam);
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExCodeService.java

+package com.liquidnet.service.goblin.service;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinNftExCodeVo;
+import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
+import com.liquidnet.service.goblin.param.GoblinNftExCodeParam;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface IGoblinNftExCodeService {
+
+    /**
+     * 获取兑换码
+     */
+    PageInfoVo selectCodePageList(GoblinNftExCodeParam goblinNftExCodeParam);
+
+    /**
+     * 兑换码主动失效
+     * @param codeIds
+     * @return
+     */
+    Boolean defDrivLoseCode(String codeIds);
+
+    /**
+     * 空投发送
+     * @param goblinNftExCodeParam
+     * @return
+     */
+    ResponseDto<Boolean> addAirdrop(GoblinNftExCodeParam goblinNftExCodeParam);
+
+    /**
+     * 兑换码导出
+     * @param httpServletResponse
+     * @param goblinNftExCodeParam
+     */
+    void excel(HttpServletResponse httpServletResponse, GoblinNftExCodeParam goblinNftExCodeParam);
+
+    /**
+     * 批量发送空投
+     * @param file
+     * @param activityId
+     * @param adminUid
+     * @return
+     */
+    ResponseDto<Boolean> addAirdrops(MultipartFile file,String activityId,String adminUid);
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExCodeTaskService.java

+package com.liquidnet.service.goblin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.sun.org.apache.xpath.internal.operations.Bool;
+
+public interface IGoblinNftExCodeTaskService {
+
+    /**
+     * 定时生成兑换码
+     */
+    ResponseDto<String> generateCode();
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExSkuService.java

+package com.liquidnet.service.goblin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.param.GoblinNftExSkuParam;
+
+import java.util.List;
+
+public interface IGoblinNftExSkuService {
+
+    /**
+     * 新增nft兑换活动和sku的关联
+     */
+    ResponseDto<Object> add(List<GoblinNftExSkuParam> goblinNftExSkuParams);
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftGoodsAppService.java

@@ -11,5 +11,4 @@ public interface IGoblinNftGoodsAppService {
 
     GoblinNftGoodsSkuInfoVo goodsDetail(String skuId);
 
-    Boolean exchange(String code);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftOrderAppService.java

@@ -11,5 +11,5 @@ public interface IGoblinNftOrderAppService {
 
     ResponseDto<GoblinNftOrderDetailsVo> orderDetails(String orderId);
 
-    GoblinPayOrderDetailsVo payOrderDetails(String skuId);
+    ResponseDto<GoblinPayOrderDetailsVo> payOrderDetails(String skuId);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftOrderService.java

@@ -25,4 +25,6 @@ public interface IGoblinNftOrderService {
     String syncOrder(GoblinNftOrderPayCallbackParam syncOrderParam);
 
     String refundSyncOrder(GoblinNftOrderRefundCallbackParam refundCallbackParam);
+
+    ResponseDto<Boolean> exchange(String code, String uid, String deviceFrom, int orderType);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftUserService.java

 package com.liquidnet.service.goblin.service;
 
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.GoblinUserNftAccInfoVo;
 
 public interface IGoblinNftUserService {
 
@@ -12,7 +13,7 @@ public interface IGoblinNftUserService {
      * @param name    证件名
      * @param idCard  证件号
      * @param mobile  手机号
-     * @return Integer[1-成功]
+     * @return ResponseDto<GoblinUserNftAccInfoVo>
      */
-    ResponseDto<Integer> openNftAccount(String uid, String bizCode, String name, String idCard, String mobile);
+    ResponseDto<GoblinUserNftAccInfoVo> openNftAccount(String uid, String bizCode, String name, String idCard, String mobile);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinUserDigitalArtworkService.java

@@ -12,4 +12,6 @@ public interface IGoblinUserDigitalArtworkService {
     GoblinUserDigitalArtworkInfoVo info(String uid, String artworkId);
 
     GoblinUserDigitalArtworkListVo unboxingForBuyOrExchange(String uid, GoblinUserDigitalArtworkVo userDigitalArtworkVo);
+
+    boolean accept(String uid, GoblinUserDigitalArtworkVo userDigitalArtworkVo);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinGoodsAnticipateMgService.java

@@ -20,24 +20,39 @@ import java.math.BigInteger;
 public interface IGoblinGoodsAnticipateMgService {
 
     /**
-     * 查询预约
+     * 获取预约
+     * @param goodsAnticipateValueParam 查询条件
+     * @return 分页查询
      */
     ResponseDto<PageInfo<GoblinGoodsAnticipateValueVo>> list(GoblinGoodsAnticipateValueParam goodsAnticipateValueParam);
 
     /**
      * 新增预约
+     * @param goodsAnticipateAddParam 新增
+     * @return 1
      */
-    ResponseDto<Object> add(GoblinGoodsAnticipateAddParam goodsAnticipateAddParam);
+    ResponseDto<String> add(GoblinGoodsAnticipateAddParam goodsAnticipateAddParam);
 
     /**
      * 修改预约人数
+     * @param antId antId
+     * @param people 修改人数
+     * @return Boolean
      */
-    ResponseDto<Object> updatePeople(String antId, BigInteger people);
+    ResponseDto<Boolean> updatePeople(String antId, BigInteger people);
 
     /**
      * 删除预约
+     * @param skuId skuId
+     * @return Boolean
      */
-    ResponseDto<Object> delete(String skuId);
+    ResponseDto<Boolean> delete(String skuId);
 
+    /**
+     * 更具sku获取信息
+     * @param skuId skuId
+     * @param hasHead 1
+     * @return 预约关联sku和spu表
+     */
     AnticipateValueVo getAnticipateValueBySkuId(String skuId,int hasHead);
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinListService.java

+package com.liquidnet.service.goblin.service.manage;
+
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.vo.GoblinListDetailsVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinListVo;
+import com.liquidnet.service.goblin.param.GoblinListCreateParam;
+import com.liquidnet.service.goblin.param.GoblinListUpdateParam;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 商城-名单表 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-04-29
+ */
+public interface IGoblinListService {
+
+    ResponseDto<PageInfo<GoblinListVo>> getList(String name, Integer page);
+
+    ResponseDto<GoblinListDetailsVo> getDetails(String listId);
+
+    ResponseDto<Boolean> create(GoblinListCreateParam param);
+
+    ResponseDto<Boolean> update(GoblinListUpdateParam param);
+
+    ResponseDto<Boolean> delete(String listId);
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreMgtGoodsSkuExtraService.java

+package com.liquidnet.service.goblin.service.manage;
+
+import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsSkuArAddParam;
+import com.liquidnet.service.goblin.dto.manage.GoblinStoreMgtGoodsSkuArFilterParam;
+import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsSkuArListVo;
+
+import java.util.List;
+
+public interface IGoblinStoreMgtGoodsSkuExtraService {
+
+    /**
+     * 商品管理:藏品AR:列表
+     *
+     * @param mgtGoodsSkuExtraFilterParam GoblinStoreMgtGoodsSkuExtraFilterParam
+     * @return PagedResult<GoblinStoreMgtGoodsSkuArListVo>
+     */
+    PagedResult<GoblinStoreMgtGoodsSkuArListVo> skuArList(GoblinStoreMgtGoodsSkuArFilterParam mgtGoodsSkuExtraFilterParam);
+
+    /**
+     * 商品管理:藏品AR:添加编辑
+     *
+     * @param uid                   UID
+     * @param mgtGoodsSkuArAddParam GoblinStoreMgtGoodsSkuArAddParam
+     * @param editFlg               true-编辑|false-添加
+     * @return boolean
+     */
+    boolean skuArAddEdit(String uid, GoblinStoreMgtGoodsSkuArAddParam mgtGoodsSkuArAddParam, boolean editFlg);
+
+    /**
+     * 商品管理:藏品AR:删除
+     *
+     * @param uid       UID
+     * @param skuIdList List<单品ID>
+     * @return boolean
+     */
+    boolean skuArDel(String uid, List<String> skuIdList);
+}

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinStoreOrderService.java

@@ -32,7 +32,7 @@ public interface IGoblinStoreOrderService {
 
     ResponseDto<Boolean> refundOrderSku(String orderId, String orderSkuId, BigDecimal price);
 
-    ResponseDto<Boolean> express(String orderId, String orderSkuIds,String mailNo);
+    ResponseDto<Boolean> express(String orderId, String orderSkuIds,String mailNo,String uid);
 
     ResponseDto<Boolean> changeExpressMailNo(String orderId, String mailId,String mailNo);
 

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/manage/IGoblinstoreMgtGoodsService.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.goblin.dto.manage.*;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsListVo;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsSkuListVo;
+import com.liquidnet.service.goblin.dto.manage.vo.GoblinStoreMgtGoodsSkuSimpleVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 
@@ -20,6 +21,8 @@ public interface IGoblinstoreMgtGoodsService {
      */
     PagedResult<GoblinStoreMgtGoodsListVo> goodsList(GoblinStoreMgtGoodsFilterParam mgtGoodsFilterParam);
 
+    PagedResult<GoblinStoreMgtGoodsSkuSimpleVo> skuList(GoblinStoreMgtGoodsSkuSimpleFilterParam mgtGoodsSkuSimpleFilterParam);
+
     PagedResult<GoblinStoreMgtGoodsSkuListVo> skusList(GoblinStoreMgtGoodsSkuFilterParam mgtGoodsSkuFilterParam);
 
     /**

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinRedisConst.java

@@ -87,4 +87,8 @@ public class KylinRedisConst {
 
     public static final String KYLIN_EXPRESS_MODULES = "kylin:express:modules";
     public static final String REDIS_KEY_KYLIN_PERFORM_SUBSCRIBE = "kylin:performSubscribe:uid:";
+
+
+    public static final String REDIS_WQ_ORDER_FIX = "kylin:wq:order:";//纪录万青 订单填写快递地址
+    public static final String REDIS_WQ_ORDER_EXPRESS = "kylin:wq:pxress:order:";//万青补偿快递vo 订单填写快递地址
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/WqTempParam.java

+package com.liquidnet.service.kylin.dto.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 万青快递补偿param
+ */
+@ApiModel(value = "WqTempParam")
+@Data
+public class WqTempParam {
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "收货人姓名")
+    private String name;
+    @ApiModelProperty(value = "代理id")
+    private String Province;
+    @ApiModelProperty(value = "省份行政编码")
+    private String county;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "收货地址")
+    private String address;
+    @ApiModelProperty(value = "区县")
+    private String phone;
+    @ApiModelProperty(value = "区县行政编码")
+    private String countyId;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/WqTempVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(value = "WqTempVo")
+@Data
+public class WqTempVo implements Cloneable{
+
+    @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "收货人姓名")
+    private String name;
+    @ApiModelProperty(value = "代理id")
+    private String Province;
+    @ApiModelProperty(value = "省份行政编码")
+    private String county;
+    @ApiModelProperty(value = "城市")
+    private String city;
+    @ApiModelProperty(value = "收货地址")
+    private String address;
+    @ApiModelProperty(value = "区县")
+    private String phone;
+    @ApiModelProperty(value = "快递单号")
+    private String mailNo;
+    @ApiModelProperty(value = "是否是万青补偿订单")
+    private Integer isTemp;
+
+    private static final WqTempVo obj = new WqTempVo();
+
+    public static WqTempVo getNew() {
+        try {
+            return (WqTempVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new WqTempVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinTempService.java

+package com.liquidnet.service.kylin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.WqTempParam;
+import com.liquidnet.service.kylin.dto.vo.WqTempVo;
+
+/**
+ * <p>
+ * 补偿接口 胡佳晨
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-05
+ */
+public interface IKylinTempService {
+
+    ResponseDto<Boolean> setWqRedis(String orderId);
+
+    ResponseDto<Boolean> delWqRedis(String orderId);
+
+    ResponseDto<Boolean> insertWqTempExpress(WqTempParam param);
+
+    ResponseDto<WqTempVo> getWqTempExpress(String orderId);
+
+    ResponseDto<Boolean> updateMailNo(String orderId,String mailNo);
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

@@ -21,6 +21,8 @@ public class SmileRedisConst {
     public static final String SELL_DATA_COMMISSION = PREFIX.concat("sellDataCommission:");  //销售数据 第一步
     public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:");  //打款信息  SELL_SHOW_PAYMENT+演出id+uid
 
+    public static final String SELL_SHOW_PAYMENT_ENDJOB = PREFIX.concat("show:payment:endJob");  //定时任务结算信息  SELL_SHOW_PAYMENT_ENDJOB+演出id+uid
+
     public static final String SELL_USER_REVENUE = PREFIX.concat("user:revenue:");  //用户总营收  SELL_USER_REVENUE+uid
 
     public static final String SELL_TEST = PREFIX.concat("test");  //用户总营收  SELL_USER_REVENUE+uid

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSchoolVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.liquidnet.service.smile.entity.SmileSchool;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +21,8 @@ public class SmileSchoolVo implements Serializable {
 
     private Long id;
 
+    private String schoolId;
+
     /**
      * 学校名称
      */
@@ -69,4 +72,21 @@ public class SmileSchoolVo implements Serializable {
     private String area;
 
 
+    public SmileSchoolVo copy(SmileSchool smileSchool) {
+        //KylinApiCameraDevicesVo kylinApiCameraDevicesVo = KylinApiCameraDevicesVo.getNew();
+        //        if (null == source) return null;
+        SmileSchoolVo smileSchoolVo = new SmileSchoolVo();
+        if (null==smileSchool) return null;
+        smileSchoolVo.setId(smileSchool.getId());
+        smileSchoolVo.setSchoolId(smileSchool.getId().toString());
+        smileSchoolVo.setName(smileSchool.getName());
+        smileSchoolVo.setAddress(smileSchool.getAddress());
+        smileSchoolVo.setProvinceKey(smileSchool.getProvinceId());
+        smileSchoolVo.setProvince(smileSchool.getProvince());
+        smileSchoolVo.setCityKey(smileSchool.getCityId());
+        smileSchoolVo.setCity(smileSchool.getCity());
+        smileSchoolVo.setAreaKey(smileSchool.getAreaId());
+        smileSchoolVo.setArea(smileSchool.getArea());
+        return smileSchoolVo;
+    }
 }

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java

 package com.liquidnet.service.goblin.service.manage;
 
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -11,6 +12,7 @@ public interface SmileFrontService {
     public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type);
     public List<KylinPerformanceVo>  getPerformance();
     public void deleteUser(String uid);
-    public boolean auth(String uid,SmileUserVO redisVo);
+    public boolean auth(String uid,SmileUserVO redisVo,boolean b);
     public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName);
+    public List<SmileSchoolVo> getSchool(String name);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinFrontCubeController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.goblin.service.impl.GoblinFrontCubeServiceImpl;
+import com.liquidnet.commons.lang.util.StringUtil;
 import com.liquidnet.service.goblin.entity.GoblinFrontCube;
 import com.liquidnet.service.goblin.param.GoblinFrontCubeParam;
 import io.swagger.annotations.Api;
@@ -52,6 +53,12 @@ public class GoblinFrontCubeController  extends BaseController {
     public AjaxResult updateOrCreate(@RequestBody List<GoblinFrontCubeParam> list) {
         List<GoblinFrontCube> list1=new ArrayList<>();
         for(GoblinFrontCubeParam goblinFrontCubeParam:list){
+            if(StringUtil.isBlank(goblinFrontCubeParam.getSpuId())||goblinFrontCubeParam.getSpuId().equals("undefined")){
+                return  error("spuId必传，请填写");
+            }
+            if(goblinFrontCubeParam.getSpuId().split(",").length==0){
+                return  error("spuId必传，请填写");
+            }
             GoblinFrontCube goblinFrontCube=new GoblinFrontCube();
             BeanUtils.copyProperties(goblinFrontCubeParam,goblinFrontCube);
             list1.add(goblinFrontCube);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java

@@ -27,6 +27,8 @@ public class SmileAgentController {
     @Autowired
     ISmileAgentService smileAgentService;
 
+    private Boolean tag = true;
+
     @PostMapping("/list")
     @ApiOperation("根据PerId获取票提")
     @ResponseBody
@@ -41,5 +43,17 @@ public class SmileAgentController {
         return smileAgentService.create(smileAgents);
     }
 
+    @PostMapping("/delPerId")
+    @ApiOperation("删除（旧版）演出id集合")
+    @ResponseBody
+    public AjaxResult delPerId(){
+        if (tag){
+            smileAgentService.delPerId();
+            tag = false;
+            return AjaxResult.success();
+        }
+        return AjaxResult.warn("已删除");
+    }
+
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java

@@ -58,4 +58,10 @@ public class SmileShowController {
         return smileShowService.allPrice(smilePriceParam);
     }
 
+    @GetMapping("/updateRedis")
+    @ApiOperation("修改原保存演出id的数据类型,分支dev_0507kids  部署完执行接口（演出列表重复问题修复也可以运行此接口）")
+    public AjaxResult updateRedis(){
+        return smileShowService.updateRedis();
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/tools/ExportDataController.java

@@ -13,16 +13,16 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.List;
+import java.util.*;
 
 @Controller
 @RequestMapping("tools/export")
 public class ExportDataController extends BaseController {
 
-
     @Autowired
     private IExportService exportService;
 
+
     private String prefix = "zhengzai/financial";
 
     @GetMapping()
@@ -80,6 +80,7 @@ public class ExportDataController extends BaseController {
         return StringUtils.isNotBlank(beginTime) && StringUtils.isNotBlank(endTime) ? true : false;
     }
 
+
     /**
      * 导出会员订单
      *

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/nftOrder/orderRefundView.html

@@ -27,10 +27,6 @@
                                 <label>订单编号：</label>
                                 <input type="text" name="orderCode"/>
                             </li>
-                            <li>
-                                <label>哈希值：</label>
-                                <input type="text" name="nftId"/>
-                            </li>
                         </div>
                         <div class="col-sm-12">
                             <li>
@@ -40,6 +36,7 @@
                                     <option value="1">购买</option>
                                     <option value="2">兑换</option>
                                     <option value="3">演出赠送</option>
+                                    <option value="4">空投赠送</option>
                                 </select>
                             </li>
                             <li>
@@ -51,7 +48,7 @@
                                 </select>
                             </li>
                             <li>
-                                <label>订单状态：</label>
+                                <label>退款状态：</label>
                                 <select name="status">
                                     <option value="">全部</option>
                                     <option value="1">申请退款</option>
@@ -59,6 +56,18 @@
                                     <option value="3">退款失败</option>
                                 </select>
                             </li>
+                            <li class="select-time">
+                                <label>支付时间： </label>
+                                <input type="text" class="time-input" placeholder="开始日期" name="payTimeStart"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" placeholder="结束日期" name="payTimeEnd"/>
+                            </li>
+                        </div>
+                        <div class="col-sm-12">
+                            <li>
+                                <label>哈希值：</label>
+                                <input type="text" name="nftId"/>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                         class="fa fa-search"></i>&nbsp;搜索</a>
@@ -156,6 +165,8 @@
                             case 3:
                                 return "演出赠送";
                                 break;
+                            case 4:
+                                return "空投赠送";
                         }
                     },
                 },

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/nftOrder/orderView.html

@@ -27,10 +27,6 @@
                                 <label>订单编号：</label>
                                 <input type="text" name="orderCode"/>
                             </li>
-                            <li>
-                                <label>哈希值：</label>
-                                <input type="text" name="nftId"/>
-                            </li>
                         </div>
                         <div class="col-sm-12">
                             <li>
@@ -40,6 +36,7 @@
                                     <option value="1">购买</option>
                                     <option value="2">兑换</option>
                                     <option value="3">演出赠送</option>
+                                    <option value="4">空投赠送</option>
                                 </select>
                             </li>
                             <li>
@@ -65,6 +62,20 @@
                                 <span>-</span>
                                 <input type="text" class="time-input" placeholder="结束日期" name="payTimeEnd"/>
                             </li>
+                        </div>
+                        <div class="col-sm-12">
+                            <li>
+                                <label>哈希值：</label>
+                                <input type="text" name="nftId"/>
+                            </li>
+                            <li>
+                                <label>兑换码：</label>
+                                <input type="text" name="exCode"/>
+                            </li>
+                            <li>
+                                <label>用户手机号：</label>
+                                <input type="text" name="userMobile"/>
+                            </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                         class="fa fa-search"></i>&nbsp;搜索</a>
@@ -125,14 +136,21 @@
                             case 3:
                                 return "演出赠送";
                                 break;
+                            case 4:
+                                return "空投赠送";
+                                break;
                         }
                     },
                 },
                 {
                     field: 'payType',
                     title: '支付方式',
-                    formatter: function (value) {
-                        return $.table.selectDictLabel(payTypeDic, value);
+                    formatter: function (value, row) {
+                        if (row.orderType == 2 || row.orderType == 4) {
+                            return row.exCode;
+                        } else {
+                            return $.table.selectDictLabel(payTypeDic, value);
+                        }
                     },
                 },
                 {
@@ -156,7 +174,21 @@
                 },
                 {
                     field: 'name',
-                    title: '藏品名称'
+                    title: '藏品名称',
+                    formatter: function (value) {
+                        return value.trim().split(" ")[0];
+                    }
+                },
+                {
+                    field: 'boxSkuId',
+                    title: '藏品类型',
+                    formatter: function (value) {
+                        if (value) {
+                            return "盲盒";
+                        } else {
+                            return "明盒";
+                        }
+                    }
                 },
                 {
                     field: 'tradingAt',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/detail.html

@@ -134,11 +134,11 @@
                     <span id="identity2">已毕业</span>
                 </div>
                 <div class="items">
-                    <p>学校全称/单位名称:</p>
+                    <p>在读学校全称/毕业院校名称:</p>
                     <input type="text" disabled id="schoolName" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
                 </div>
                 <div class="items">
-                    <p>所学专业/所在部门:</p>
+                    <p>所学专业:</p>
                     <input type="text" disabled id="schoolMajor" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
                 </div>
                 <!-- <div class="items">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html

@@ -9,7 +9,7 @@
 <div class="detail_status">用户状态：<span></span></div>
 <p class="detail_title">基础资料</p>
 <p>照片</p>
-<div class="detail_inner detail_img"><img src=""></div>
+<div class="detail_inner detail_img"><img style="height: 120px;" src=""></div>
 <p>真实姓名</p>
 <div class="detail_inner detail_name"></div>
 <p>出生日期</p>
@@ -20,9 +20,9 @@
 <div class="detail_inner detail_city"></div>
 <p>你的身份</p>
 <div class="detail_inner detail_id"></div>
-<p>学校全称/单位名称</p>
+<p>在读学校全称/毕业院校名称</p>
 <div class="detail_inner detail_school"></div>
-<p>所学专业/所在部门</p>
+<p>所学专业</p>
 <div class="detail_inner detail_acc"></div>
 <!--<p>微信号</p>-->
 <!--<div class="detail_inner detail_wx"></div>-->
@@ -33,6 +33,10 @@
 <div class="detail_inner detail_idcode"></div>
 <p class="detail_title">自我介绍</p>
 <div class="detail_inner detail_desc"></div>
+<p class="detail_title">个人技能(选填)</p>
+<div class="detail_inner detail_desc1"></div>
+<div class="detail_inner detail_desc2"></div>
+<div class="detail_inner detail_desc3"></div>
 <p>手机号：</p>
 <div class="detail_inner detail_mobail"></div>
 <!--<p>提交时间：</p>-->
@@ -124,6 +128,9 @@
             $('.detail_name').text(detailData.name);
             $('.detail_idcode').text(detailData.idCard);
             $('.detail_desc').text(detailData.introduce);
+            $('.detail_desc1').text(detailData.specialty1);
+            $('.detail_desc2').text(detailData.specialty2);
+            $('.detail_desc3').text(detailData.specialty3);
             $('.detail_mobail').text(detailData.phone);
             $('.detail_created').text(detailData.createdDate);
             if (detailData.type != 0) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -29,7 +29,7 @@
             <label class="col-sm-3 control-label is-required">头像：</label>
             <div class="col-sm-8">
                 <!--                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
-                <img class="img-details" name="img" th:src="*{img}"
+                <img class="img-details" style="height: 800px;" name="img" th:src="*{img}"
                      th:onclick="click_big([[*{img}]])">
             </div>
         </div>
@@ -60,12 +60,12 @@
                        required>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">专长：</label>
-            <div class="col-sm-8">
-                <input name="specialty" class="form-control" type="text" th:value="*{specialty}" readonly required>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label is-required">专长：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="specialty" class="form-control" type="text" th:value="*{specialty}" readonly required>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">特长：</label>
             <div class="col-sm-8">
@@ -150,6 +150,27 @@
         focusCleanup: true
     });
 
+    // 点击图片放大
+    function click_big(url) {
+        var img_url = url
+        if (url.indexOf("x-oss-process") != "-1") {
+            img_url = url.split("?")[0]
+        }
+        var json = {
+            "data": [   //相册包含的图片，数组格式
+                {
+                    "alt": "图片",
+                    "src": img_url, //原图地址
+                }
+            ]
+        };
+        layer.photos({
+            photos: json,
+            closeBtn: 1, //右上角按钮，可通过配置1和2来展示，如果不显示，则closeBtn: 0
+            anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+        });
+    }
+
     function submitHandler(status) {
         var teamIds = $("input[name^='teamCheck']:checked").val()
         var uid = $("input[name^='uid']").val()

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html

@@ -30,6 +30,14 @@
                             <label>手机号：</label>
                             <input type="text" name="phone"/>
                         </li>
+                        <li>
+                            <label>性别：</label>
+                            <select name="sex">
+                                <option value="-1">全部</option>
+                                <option value="1">男</option>
+                                <option value="2">女</option>
+                            </select>
+                        </li>
                         <li>
                             <label>审核状态：</label>
                             <select name="status">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/project/list.html

@@ -53,29 +53,61 @@
             columns: [{
                 checkbox: true
             },
-                {
-                    field: 'projectId',
-                    title: '活动id'
-                },
+                // {
+                //     field: 'projectId',
+                //     title: '活动id'
+                // },
                 {
                     field: 'title',
                     title: '活动名称'
                 },
+
                 {
-                    field: 'img',
-                    title: '封面图',
-                    formatter: function (value, row, index) {
-                        return $.table.imageView(value, "300", "300");
-                    }
+                    field: 'all',
+                    title: '报名人数'
+                },
+                {
+                    field: 'unAudit',
+                    title: '待审核'
+                },
+                {
+                    field: 'audit',
+                    title: '审核通过'
                 },
+                {
+                    field: 'refuse',
+                    title: '已拒绝'
+                },
+
+                // {
+                //     field: 'img',
+                //     title: '封面图',
+                //     formatter: function (value, row, index) {
+                //         return $.table.imageView(value, "300", "300");
+                //     }
+                // },
                 {
                     field: 'timeStart',
-                    title: '开始时间'
+                    title: '活动时间',
+                    formatter: function (value, row, index) {
+                        return row.timeStart.split("T")[0] +" 至 "+row.timeEnd.split("T")[0]
+                    }
                 },
                 {
-                    field: 'timeEnd',
-                    title: '结束时间'
+                    field: 'timeStatus',
+                    title: '活动状态',
+                    formatter: function (value, row, index) {
+                        if(value===1){
+                            return "活动中"
+                        }else{
+                            return "已结束";
+                        }
+                    }
                 },
+                // {
+                //     field: 'timeEnd',
+                //     title: '结束时间'
+                // },
 
                 {
                     field: 'createdAt',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/test/java/com.liquidnet.client.admin/TestLocal.java

 package com.liquidnet.client.admin;
 
-import com.liquidnet.client.admin.common.utils.security.Md5Utils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.MD5;
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.liquidnet.service.smile.entity.SmileSchool;
+import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import org.junit.Test;
@@ -23,6 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * Test
@@ -69,4 +74,18 @@ public class TestLocal {
         boolean contains = Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE));
         System.out.println(contains);
     }
+
+    @Autowired
+    private SmileSchoolMapper smileSchoolMapper;
+
+    @Test
+    public void testSaveSmileSchoolMongodb(){
+        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+        queryWrapper.eq(SmileSchool::getDelTag,0);
+        List<SmileSchool> smileSchools = smileSchoolMapper.selectList(queryWrapper);
+        smileSchools.forEach(smileSchool->{
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
+            mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
+        });
+    };
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/adam/dto/GoblinNftOrderListExcelDto.java

@@ -24,7 +24,7 @@ public class GoblinNftOrderListExcelDto implements Serializable, Cloneable {
     private String priceActual;
     @Excel(name = "订单状态")
     private String status;
-    @Excel(name = "下大美时间")
+    @Excel(name = "下单时间")
     private String createdAt;
     @Excel(name = "支付时间")
     private String payTime;
@@ -59,6 +59,9 @@ public class GoblinNftOrderListExcelDto implements Serializable, Cloneable {
             case 3:
                 this.setOrderType("演出赠送");
                 break;
+            case 4:
+                this.setOrderType("空投赠送");
+                break;
             default:
                 this.setOrderType("未知");
                 break;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinExportServiceImpl.java

+//package com.liquidnet.client.admin.zhengzai.goblin.service.impl;
+//
+//import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+//import com.liquidnet.client.admin.common.exception.BusinessException;
+//import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
+//import com.liquidnet.client.admin.zhengzai.goblin.service.IGoblinExportService;
+//import com.liquidnet.service.goblin.dto.MallOrdertDao;
+//import com.liquidnet.service.goblin.mapper.GoblinStoreOrderMapper;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.poi.xssf.usermodel.*;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.io.FileOutputStream;
+//import java.io.IOException;
+//import java.io.OutputStream;
+//import java.text.ParseException;
+//import java.text.SimpleDateFormat;
+//import java.util.*;
+//
+//@Service
+//@Slf4j
+//public class GoblinExportServiceImpl implements IGoblinExportService {
+//
+//    @Autowired
+//    GoblinStoreOrderMapper goblinStoreOrderMapper;
+//
+//    @Override
+//    public AjaxResult exportMallOrder(String beginTime, String endTime, String state, Integer mailType) {
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//        try {
+//            Date beginDate = sdf.parse(beginTime);
+//            Date endDate = sdf.parse(endTime);
+//            List<String> states = null;
+//            if (StringUtils.isNotBlank(state)) {
+//                states = Arrays.asList(state.split(","));
+//            }
+//            List<MallOrdertDao> voList = goblinStoreOrderMapper.exportMallOrder(beginDate, endDate, states ,mailType);
+//            AjaxResult ajaxResult = null;
+//            Map<String, List<String>> map = new HashMap<>();
+//            int max = 0;
+//            //将数据保存到list中
+//            if (voList != null && voList.size() > 0) {
+//                for (MallOrdertDao te : voList) {
+//                    String orderCode = te.getOrderCode();
+//                    if (map.get(orderCode) == null) {
+//                        List<String> list = new ArrayList<>();
+//                        list.add(te.getOrderCode());
+//                        list.add(te.getUserMobile());
+//                        list.add(te.getPriceExpress());
+//                        list.add(te.getPriceCoupon());
+//                        list.add(te.getStorePriceCoupon());
+//                        list.add(te.getExpressContacts());
+//                        list.add(te.getExpressPhone());
+//                        list.add(te.getExpressDetailAddress());
+//                        list.add(te.getPayType());
+//                        list.add(te.getPayTime());
+//                        list.add(te.getCreatedAt());
+//                        list.add(te.getLogisticsCompany());
+//                        list.add(te.getMailNo());
+//                        list.add(te.getSpuId());
+//                        list.add(te.getName());
+//                        list.add(te.getCate1Name());
+//                        list.add(te.getCate2Name());
+//                        list.add(te.getSkuName());
+//                        list.add(te.getNum());
+//                        list.add(te.getSkuPrice());
+//                        list.add(te.getSkuPriceActual());
+//                        list.add(te.getOrderSkuId());
+//                        max = Math.max(max, list.size());
+//                        map.put(orderCode, list);
+//                        continue;
+//                    }
+//                    if (map.get(orderCode) != null) {
+//                        List<String> list = map.get(orderCode);
+//                        list.add(te.getSpuId());
+//                        list.add(te.getName());
+//                        list.add(te.getCate1Name());
+//                        list.add(te.getCate2Name());
+//                        list.add(te.getSkuName());
+//                        list.add(te.getNum());
+//                        list.add(te.getSkuPrice());
+//                        list.add(te.getSkuPriceActual());
+//                        list.add(te.getOrderSkuId());
+//                        max = Math.max(max, list.size());
+//                        map.put(orderCode, list);
+//                    }
+//                }
+//                return exportexcel(map, "order", max);
+//            }
+//            return AjaxResult.error("查无信息！");
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//            throw new BusinessException("导出Excel失败，请联系网站管理员！");
+//        }
+//    }
+//
+//    //导出Excel
+//    private AjaxResult exportexcel(Map<String, List<String>> map, String name, int max) {
+//        //实例化XSSFWorkbook对象，相当于新建一个Excel文件
+//        XSSFWorkbook workbook = new XSSFWorkbook();
+//        //根据XSSFWorkbook获取Sheet
+//        XSSFSheet sheet = workbook.createSheet();
+//        //添加一行作为表格头
+//        XSSFRow header = sheet.createRow(0);
+//
+//        //创建表格样式
+//        XSSFCellStyle cellStyle = workbook.createCellStyle();
+//        //cellStyle.setAlignment(CellStyle.ALIGN_CENTER);//内容居中显示
+//
+//        //创建头部表格
+//        XSSFCell cell = null;
+//        int index = 0;
+//        //固定表头
+//        List<String> fixedCells = fixedCells();
+//        for (String cname : fixedCells) {
+//            cell = header.createCell(index);
+//            cell.setCellStyle(cellStyle);
+//            cell.setCellValue(cname);
+//            index++;
+//        }
+//
+//        int n = 13; //固定表头13个
+//        int indext = 0;
+//        //追加表头
+//        List<String> cells = appendCells();
+//        while (n < max) {
+//            indext++;
+//            for (String cname : cells) {
+//                cell = header.createCell(n);
+//                cell.setCellStyle(cellStyle);
+//                cell.setCellValue(cname + indext);
+//                n++;
+//            }
+//        }
+//        int z = 1;
+//        for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+//            List<String> list = entry.getValue();
+//            //获取每行
+//            XSSFRow content = sheet.createRow(z);
+//            for (int i = 0; i < list.size(); i++) {
+//                //创建单元格并设置值
+//                content.createCell(i).setCellValue(list.get(i));
+//            }
+//            z++;
+//        }
+//        OutputStream fileOutputStream = null;
+//        try {
+//            ExcelUtil<MallOrdertDao> util = new ExcelUtil(MallOrdertDao.class);
+//            String filename = util.encodingFilename(name);
+//            //写入文件
+//            fileOutputStream = new FileOutputStream(util.getAbsoluteFile(filename));
+//            workbook.write(fileOutputStream);
+//            return AjaxResult.success("导出成功！",filename);
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//            throw new BusinessException("导出Excel失败，请联系网站管理员！");
+//        } finally {
+//            if (workbook != null) {
+//                try {
+//                    workbook.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//            if (fileOutputStream != null) {
+//                try {
+//                    fileOutputStream.close();
+//                } catch (IOException e) {
+//                    e.printStackTrace();
+//                }
+//            }
+//        }
+//    }
+//
+//    //固定表头
+//    private List<String> fixedCells() {
+//        List<String> cells = new ArrayList<>();
+//        cells.add("订单编号");
+//        cells.add("购买人手机号");
+//        cells.add("快递费");
+//        cells.add("平台券优惠券金额");
+//        cells.add("店铺券优惠金额");
+//        cells.add("收货人");
+//        cells.add("收货人电话");
+//        cells.add("快递地址");
+//        cells.add("支付方式");
+//        cells.add("支付时间");
+//        cells.add("下单时间");
+//        cells.add("快递公司");
+//        cells.add("物流单号");
+//        return cells;
+//    }
+//
+//    //追加表头
+//    private List<String> appendCells() {
+//        List<String> cells = new ArrayList<>();
+//        cells.add("商品id");
+//        cells.add("商品名");
+//        cells.add("一级分类");
+//        cells.add("二级分类");
+//        cells.add("款式");
+//        cells.add("数量");
+//        cells.add("单价");
+//        cells.add("价格");
+//        cells.add("订单skuId");
+//        return cells;
+//    }
+//
+//}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontCubeServiceImpl.java

@@ -67,6 +67,17 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
     public boolean updateOrCreate(List<GoblinFrontCube> list) {
         for(GoblinFrontCube goblinFrontCube:list){
             if (goblinFrontCube.getMid() == 0) {
+                String spuIds="";
+                for(String spuId:goblinFrontCube.getSpuId().split(",")){
+                    if(spuId.equals("")||spuId.equals("undefined")){
+
+                    }else{
+                        spuIds=spuIds.concat(spuId).concat(",");
+                    }
+                }
+                if(spuIds.length()>0){
+                    goblinFrontCube.setSpuId(spuIds.substring(0,spuIds.length()-1));
+                }
                 this.create(goblinFrontCube);
             } else {
                 goblinFrontCube.setUpdateTime(LocalDateTime.now());
@@ -79,7 +90,10 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
                         spuIds=spuIds.concat(spuId).concat(",");
                     }
                 }
-                goblinFrontCube.setSpuId(spuIds);
+                if(spuIds.length()>0){
+                    goblinFrontCube.setSpuId(spuIds.substring(0,spuIds.length()-1));
+                }
+
                 goblinFrontCubeMapper.updateById(goblinFrontCube);
             }
         }
@@ -107,7 +121,9 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
                 List<GoblinGoods> goodsList= goblinGoodsMapper.selectList(queryWrappers);
                 GoblinFrontCubeParam goblinFrontCubeParam=new GoblinFrontCubeParam();
                 BeanUtils.copyProperties(goblinFrontCube,goblinFrontCubeParam);
-                goblinFrontCubeParam.setGoblinGoods(goodsList.get(0));
+                if(null!=goodsList&&goodsList.size()>0){
+                    goblinFrontCubeParam.setGoblinGoods(goodsList.get(0));
+                }
                 list1.add(goblinFrontCubeParam);
             }
         }
@@ -139,6 +155,8 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
             }
             //redis
             redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLINFRONTCUBE,list);
+        }else{
+            redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLINFRONTCUBE,list);
         }
 
         return true;
@@ -164,6 +182,8 @@ public class GoblinFrontCubeServiceImpl extends ServiceImpl<GoblinFrontCubeMappe
             }
             //redis
             redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLIN_RECOMMEND,list);
+        }else{
+            redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.FRONT_GOBLIN_RECOMMEND,list);
         }
         return true;
     }