Merge branch 'master' into dev_kid

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,19 +124,12 @@ 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_NUM_ACCOUNT = PREFIX.concat("nft:account:");// nft用户数字账户是否开通 userId
 
@@ -234,15 +227,85 @@ 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");
 
+    /**
+     * 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/dto/GoblinQueueBizIntegralDto.java

+package com.liquidnet.service.goblin.dto;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 积分增减队列消息体
+ *
+ * @author jiangxiulong
+ */
+@Data
+public class GoblinQueueBizIntegralDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 7538372638864080920L;
+
+    private String content;
+    private BigDecimal score;
+    private String uid;
+    private int type; // 1增 2减
+
+    private static final GoblinQueueBizIntegralDto obj = new GoblinQueueBizIntegralDto();
+
+    public static GoblinQueueBizIntegralDto getNew() {
+        try {
+            return (GoblinQueueBizIntegralDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinQueueBizIntegralDto();
+        }
+    }
+
+    public String toJson() {
+        return JsonUtils.toJson(this);
+    }
+}

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

+package com.liquidnet.service.goblin.dto;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * mongo队列消息体
+ *
+ * @author jiangxiulong
+ */
+@Data
+public class GoblinQueueBizMongoDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = -5850588358672254766L;
+    /**
+     * Mongo集合名
+     */
+    private String collect;
+    /**
+     * Mongo集合中的字段属性名称
+     */
+    private String column;
+    /**
+     * Mongo集合中的字段属性值
+     */
+    private String bizId;
+    /**
+     * Redis缓存中的Key前缀
+     */
+    private String prefix;
+    /**
+     * 操作类型[1-insert|2-update]
+     */
+    private int opType;
+
+    private static final GoblinQueueBizMongoDto obj = new GoblinQueueBizMongoDto();
+
+    public static GoblinQueueBizMongoDto getNew() {
+        try {
+            return (GoblinQueueBizMongoDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinQueueBizMongoDto();
+        }
+    }
+
+    public String toJson() {
+        return JsonUtils.toJson(this);
+    }
+}

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/GoblinStoreMgtGoodsSkuFilterParam.java

@@ -23,7 +23,7 @@ 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;
 
 }

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/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,16 @@ 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;
 
     public String getSaleStartTime() {
         return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStartTime);
@@ -70,6 +80,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/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/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;
+
+
+    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;
+
+    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,13 @@ 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;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
 
@@ -122,6 +129,8 @@ 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());

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.service.goblin.entity.GoblinNftOrder;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
  */
 @ApiModel(value = "GoblinNftOrderVo", description = "订单详情信息")
 @Data
-@EqualsAndHashCode(callSuper = false)
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinNftOrderVo implements Serializable, Cloneable {
 
     private static final long serialVersionUID = -6916300673285309996L;
@@ -34,6 +34,9 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "款式id")
     private String skuId;
 
+    @ApiModelProperty(value = "款式名称")
+    private String skuTitle;
+
     @ApiModelProperty(value = "盲盒抽取的款式id")
     private String boxSkuId;
 
@@ -138,6 +141,7 @@ public class GoblinNftOrderVo implements Serializable, Cloneable {
         this.setOrderId(source.getOrderId());
         this.setSpuId(source.getSpuId());
         this.setSkuId(source.getSkuId());
+        this.setSkuTitle(source.getSkuTitle());
         this.setBoxSkuId(source.getBoxSkuId());
         this.setNum(source.getNum());
         this.setStoreId(source.getStoreId());

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/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;

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/GoblinUserDigitalArtworkVo.java

@@ -31,6 +31,7 @@ public class GoblinUserDigitalArtworkVo implements Serializable, Cloneable {
     /* ---------------------- 冗余SPU信息 ---------------------- */
     private String author;
     private String publisher;
+    private String hitArtworkId;
 
     private static final GoblinUserDigitalArtworkVo obj = new GoblinUserDigitalArtworkVo();
 

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/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 javax.validation.constraints.NotBlank;
+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 = "用户id")
+    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 = "当前页(查询时传入)")
+    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/service/IGoblinExportService.java

+package com.liquidnet.service.goblin.service;
+
+import com.liquidnet.service.base.ResponseDto;
+
+import javax.servlet.http.HttpServletResponse;
+
+public interface IGoblinExportService {
+    //导出商城订单信息
+    ResponseDto<Boolean> 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.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);
+}

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/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/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/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-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-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/tools/ExportDataController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.tools;
+
+import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.*;
+import com.liquidnet.client.admin.zhengzai.kylin.service.IExportService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.*;
+
+@Controller
+@RequestMapping("tools/export")
+public class ExportDataController extends BaseController {
+
+    @Autowired
+    private IExportService exportService;
+
+
+    private String prefix = "zhengzai/financial";
+
+    @GetMapping()
+    public String financial() {
+        return prefix + "/export";
+    }
+
+    /**
+     * 导出订单明细
+     *
+     * @param exportType
+     * @param beginTime
+     * @param endTime
+     * @param showId
+     * @return
+     */
+    @PostMapping("/export/orderInfo")
+    @ResponseBody
+    public AjaxResult exportOrderInfo(Integer exportType, String beginTime, String endTime, String showId) {
+        if (null == exportType) {
+            return error("导出类型有误！");
+        }
+        if (exportType == 1) {//按订单时间导出信息
+            if (!timeIsNotNull(beginTime, endTime)) {
+                return error("按时间类型导出，开始时间和结束时间不能为空！");
+            }
+            List<OrderDetailedExportVo> list = exportService.exportOrderByOrderTime(beginTime, endTime);
+            if (list.size() > 0) {
+                ExcelUtil<OrderDetailedExportVo> util = new ExcelUtil(OrderDetailedExportVo.class);
+                return util.exportExcel(list, exportType + "");
+            }
+        } else if (exportType == 2) {//按演出时间导出信息
+            if (!timeIsNotNull(beginTime, endTime)) {
+                return error("按时间类型导出，开始时间和结束时间不能为空！");
+            }
+            List<OrderDetailedByShowDateExportVo> byShowTimeList = exportService.exportOrderByShowTime(beginTime, endTime);
+            if (byShowTimeList.size() > 0) {
+                ExcelUtil<OrderDetailedByShowDateExportVo> util = new ExcelUtil(OrderDetailedByShowDateExportVo.class);
+                return util.exportExcel(byShowTimeList, exportType + "");
+            }
+        } else if (exportType == 3) {//按id导出信息
+            if (!StringUtils.isNotBlank(showId)) {
+                return error("演出id不能为空！");
+            }
+            List<OrderDetailedByShowIdExportVo> byShowIdList = exportService.exportOrderByShowId(showId);
+            if (byShowIdList.size() > 0) {
+                ExcelUtil<OrderDetailedByShowIdExportVo> util = new ExcelUtil(OrderDetailedByShowIdExportVo.class);
+                return util.exportExcel(byShowIdList, exportType + "");
+            }
+        }
+        return error("查无信息！");
+    }
+
+    private boolean timeIsNotNull(String beginTime, String endTime) {
+        return StringUtils.isNotBlank(beginTime) && StringUtils.isNotBlank(endTime) ? true : false;
+    }
+
+
+    /**
+     * 导出会员订单
+     *
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @PostMapping("/export/memberOrder")
+    @ResponseBody
+    public AjaxResult exportMemberOrder(String beginTime, String endTime) {
+        if (!timeIsNotNull(beginTime, endTime)) {
+            return error("开始时间和结束时间不能为空！");
+        }
+        List<OrderMemberExportVo> list = exportService.exportMemberOrder(beginTime, endTime);
+        if (list.size() == 0) {
+            return error("查无信息");
+        }
+        ExcelUtil<OrderMemberExportVo> util = new ExcelUtil(OrderMemberExportVo.class);
+        return util.exportExcel(list, "会员订单");
+    }
+
+    /**
+     * 导出商品订单
+     *
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @PostMapping("/export/commodityOrder")
+    @ResponseBody
+    public AjaxResult exportCommodityOrder(String beginTime, String endTime) {
+        if (!timeIsNotNull(beginTime, endTime)) {
+            return error("开始时间和结束时间不能为空！");
+        }
+        List<OrderCommodityExportVo> list = exportService.exportCommodityOrder(beginTime, endTime);
+        if (list.size() == 0) {
+            return error("查无信息");
+        }
+        ExcelUtil<OrderCommodityExportVo> util = new ExcelUtil(OrderCommodityExportVo.class);
+        return util.exportExcel(list, "商品订单");
+    }
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-client-admin-web.yml

@@ -10,9 +10,9 @@ spring:
   cloud:
     config:
 #      uri: http://127.0.0.1:7002/support-config
-      uri: http://39.107.71.112:7002/support-config
+#      uri: http://39.107.71.112:7002/support-config
       name: ${spring.application.name},${spring.application.name}-druid #默认为spring.application.name
-#      profile: ${liquidnet.cloudConfig.profile}
-#      discovery:
-#        enabled: true
-#        service-id: liquidnet-support-config
+      profile: ${liquidnet.cloudConfig.profile}
+      discovery:
+        enabled: true
+        service-id: liquidnet-support-config

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html

@@ -285,6 +285,9 @@
                         } else if(26 == targetType) {
                             Id = dataList[i].id;
                             Title = dataList[i].name;
+                        }else if(7 == targetType || 9 == targetType) {
+                            Id = dataList[i].spuId;
+                            Title = dataList[i].spuName;
                         } else {
                             Id = dataList[i].id;
                             Title = dataList[i].title;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/financial/export.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+
+<head>
+    <th:block th:include="include :: header('财务导出')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
+</head>
+<style>
+    td {
+        horiz-align: center;
+        text-align: left;
+        padding: 10px;
+    }
+
+</style>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <div class="col-sm-12 search-collapse">
+        <form id="formId">
+            <div class="select-list">
+                <ul>
+                    <li>
+                        <label>搜索类型：</label>
+                        <select id="type" name="type">
+                            <option value="0">请选择</option>
+                            <option value="1">商品[订单时间]</option>
+                            <option value="2">演出[订单时间]</option>
+                            <option value="3">演出[演出id]</option>
+                            <option value="4">演出[演出时间]</option>
+                            <option value="5">会员[订单时间]</option>
+                        </select>
+                    </li>
+                    <li>
+                        <label>演出id：</label>
+                        <input id="performanceId" type="text" name="performanceId"/>
+                    </li>
+                    <li>
+                        <div class="form-group">
+                            <label>时间范围：</label>
+                            <input type="text" style="width: 200px;float: left"
+                                   class="form-control" id="startTime" placeholder="开始时间选择" name="timeStart"/>
+                            <span class="control-label"
+                                  style="float: left;margin-left: 10px;margin-right: 10px"> - </span>
+                            <input type="text" style="width: 200px;float: left"
+                                   class="form-control" id="endTime" placeholder="结束时间选择" name="timeEnd"/>
+                        </div>
+                    </li>
+                    <li>
+                        <a class="btn btn-primary btn-rounded btn-sm" onclick="searchExport()"><i
+                                class="fa fa-search"></i>导出</a>
+                    </li>
+                </ul>
+            </div>
+        </form>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+
+<script th:inline="javascript">
+    var prefix = ctx + "tools/export";
+    var url = prefix;
+    var formData = new FormData();
+
+    $("input[name='timeStart']").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+
+    $("input[name='timeEnd']").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+
+    function searchExport() {
+        var type = document.getElementById("type").value;
+        var performanceId = document.getElementById("performanceId").value;
+        var st = document.getElementById("startTime").value;
+        var et = document.getElementById("endTime").value;
+        var exportType = 0;
+        if (type == 2) {
+            exportType = 1;
+        } else if (type == 3) {
+            exportType = 3;
+        } else if (type == 4) {
+            exportType = 2;
+        }
+        if (type == 0) {
+            alert("请选择导出类型");
+            return
+        } else if (type == 1) {//商品导出逻辑
+            if (st == "" || et == "") {
+                alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/commodityOrder";
+            }
+        } else if (type == 2) {//演出[订单时间]
+            if (st == "" || et == "") {
+                alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/orderInfo";
+            }
+        } else if (type == 3) {//演出[演出id]
+            if (performanceId == "") {
+                alert("演出id不能为空");
+                return
+            } else {
+                url = url + "/export/orderInfo";
+            }
+        } else if (type == 4) {//演出[演出时间]
+            if (st == "" || et == "") {
+                alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/orderInfo";
+            }
+        } else if (type == 5) {//会员[订单时间]
+            if (st == "" || et == "") {
+                alert("请选择时间范围");
+                return
+            } else {
+                url = url + "/export/memberOrder";
+            }
+        }
+        var options = {
+            modalName: "财务导出",
+            exportUrl: url,
+        }
+        $.table.init(options);
+        var param = {
+            "beginTime": st,
+            "endTime": et,
+            "showId": performanceId,
+            "exportType": exportType
+        };
+        $.table.exportExcel("", param)
+        url = prefix;
+    }
+</script>
+</body>
+</html>

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

@@ -40,6 +40,7 @@
                                     <option value="1">购买</option>
                                     <option value="2">兑换</option>
                                     <option value="3">演出赠送</option>
+                                    <option value="4">空投赠送</option>
                                 </select>
                             </li>
                             <li>
@@ -156,6 +157,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

@@ -40,6 +40,7 @@
                                     <option value="1">购买</option>
                                     <option value="2">兑换</option>
                                     <option value="3">演出赠送</option>
+                                    <option value="4">空投赠送</option>
                                 </select>
                             </li>
                             <li>
@@ -125,6 +126,9 @@
                             case 3:
                                 return "演出赠送";
                                 break;
+                            case 4:
+                                return "空投赠送";
+                                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/kylin/dto/OrderCommodityExportVo.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.kylin.dao.CommodityOrderExportDao;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderCommodityExportVo implements Serializable, Cloneable {
+
+    @Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING)
+    private String code;
+    @Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING)
+    private String paymentId;
+    @Excel(name = "商品名称", cellType = Excel.ColumnType.STRING)
+    private String name;
+    @Excel(name = "支付平台", cellType = Excel.ColumnType.STRING)
+    private String paymentType;
+    @Excel(name = "实际支付价格", cellType = Excel.ColumnType.STRING)
+    private String priceActual;
+    @Excel(name = "创建时间", cellType = Excel.ColumnType.STRING)
+    private String createdAt;
+    @Excel(name = "快递费", cellType = Excel.ColumnType.STRING)
+    private String priceExpress;
+    @Excel(name = "退款价格", cellType = Excel.ColumnType.STRING)
+    private String priceRefund;
+    @Excel(name = "状态", cellType = Excel.ColumnType.STRING)
+    private String status;
+    @Excel(name = "退款时间", cellType = Excel.ColumnType.STRING)
+    private String refundAt;
+
+
+    private static final OrderCommodityExportVo obj = new OrderCommodityExportVo();
+
+    public static OrderCommodityExportVo getNew() {
+        try {
+            return (OrderCommodityExportVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new OrderCommodityExportVo();
+    }
+
+    public OrderCommodityExportVo copyCommodityOrderExportVo(CommodityOrderExportDao source) {
+        this.setCode(source.getCode());
+        this.setPaymentId(source.getPaymentId());
+        this.setName(source.getName());
+        this.setPaymentType(source.getPaymentType());
+        this.setPriceActual(source.getPriceActual());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setPriceExpress(source.getPriceExpress());
+        this.setPriceRefund(source.getPriceRefund());
+        this.setStatus(source.getStatus());
+        this.setRefundAt(source.getRefundAt());
+        return this;
+    }
+
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderDetailedByShowDateExportVo.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.kylin.dao.OrderExportDao;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderDetailedByShowDateExportVo implements Serializable, Cloneable {
+    @Excel(name = "订单号", cellType = Excel.ColumnType.STRING)
+    private String orderCode;
+    @Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING)
+    private String payCode;
+    @Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING)
+    private String paymentId;
+    @Excel(name = "购买名称", cellType = Excel.ColumnType.STRING)
+    private String performanceTitle;
+    @Excel(name = "支付平台", cellType = Excel.ColumnType.STRING)
+    private String paymentType;
+    @Excel(name = "演出类型", cellType = Excel.ColumnType.STRING)
+    private String type;
+    @Excel(name = "票种名称", cellType = Excel.ColumnType.STRING)
+    private String title1;
+    @Excel(name = "购票数量", cellType = Excel.ColumnType.STRING)
+    private String number;
+    @Excel(name = "场次", cellType = Excel.ColumnType.STRING)
+    private String title2;
+    //todo
+    @Excel(name = "退款时间", cellType = Excel.ColumnType.STRING)
+    private String updateAt;
+    @Excel(name = "退款原因", cellType = Excel.ColumnType.STRING)
+    private String reject;
+    @Excel(name = "支付金额", cellType = Excel.ColumnType.STRING)
+    private String priceActual;
+    @Excel(name = "支付时间", cellType = Excel.ColumnType.STRING)
+    private String timePay;
+
+
+
+    private static final OrderDetailedByShowDateExportVo obj = new OrderDetailedByShowDateExportVo();
+
+    public static OrderDetailedByShowDateExportVo getNew() {
+        try {
+            return (OrderDetailedByShowDateExportVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new OrderDetailedByShowDateExportVo();
+    }
+
+    public OrderDetailedByShowDateExportVo copyOrderExportVo(OrderExportDao source) {
+        this.setPerformanceTitle(source.getPerformanceTitle());
+        this.setOrderCode(source.getOrderCode());
+        this.setPayCode(source.getPayCode());
+        this.setPaymentId(source.getPaymentId());
+        this.setPaymentType(source.getPaymentType());
+        this.setType(source.getType());
+        this.setTitle1(source.getTitle1());
+        this.setTitle2(source.getTitle2());
+        this.setNumber(source.getNumber());
+        this.setPriceActual(source.getPriceActual());
+        this.setUpdateAt(source.getRefundAt());
+        this.setReject(source.getReject());
+        this.setTimePay(source.getTimePay());
+        return this;
+    }
+
+
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderDetailedByShowIdExportVo.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.kylin.dao.OrderExportDao;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderDetailedByShowIdExportVo implements Serializable, Cloneable {
+    @Excel(name = "订单号", cellType = Excel.ColumnType.STRING)
+    private String orderCode;
+    @Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING)
+    private String payCode;
+    @Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING)
+    private String paymentId;
+    @Excel(name = "购买名称", cellType = Excel.ColumnType.STRING)
+    private String performanceTitle;
+    @Excel(name = "支付平台", cellType = Excel.ColumnType.STRING)
+    private String paymentType;
+    @Excel(name = "数量", cellType = Excel.ColumnType.STRING)
+    private String number;
+    @Excel(name = "单价", cellType = Excel.ColumnType.STRING)
+    private String price;
+    @Excel(name = "支付金额", cellType = Excel.ColumnType.STRING)
+    private String priceActual;
+    @Excel(name = "快递费", cellType = Excel.ColumnType.STRING)
+    private String priceExpress;
+    @Excel(name = "退票数量", cellType = Excel.ColumnType.STRING)
+    private String refundNumber;
+    @Excel(name = "演出类型", cellType = Excel.ColumnType.STRING)
+    private String type;
+    @Excel(name = "票种名称", cellType = Excel.ColumnType.STRING)
+    private String title1;
+    @Excel(name = "场次", cellType = Excel.ColumnType.STRING)
+    private String title2;
+    @Excel(name = "退款时间", cellType = Excel.ColumnType.STRING)
+    private String updateAt;
+    @Excel(name = "退款原因", cellType = Excel.ColumnType.STRING)
+    private String reject;
+    @Excel(name = "退款金额", cellType = Excel.ColumnType.STRING)
+    private String priceRefund;
+    @Excel(name = "支付时间", cellType = Excel.ColumnType.STRING)
+    private String timePay;
+
+    private static final OrderDetailedByShowIdExportVo obj = new OrderDetailedByShowIdExportVo();
+
+    public static OrderDetailedByShowIdExportVo getNew() {
+        try {
+            return (OrderDetailedByShowIdExportVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new OrderDetailedByShowIdExportVo();
+    }
+
+    public OrderDetailedByShowIdExportVo copyOrderExportVo(OrderExportDao source) {
+        this.setPerformanceTitle(source.getPerformanceTitle());
+        this.setOrderCode(source.getOrderCode());
+        this.setPayCode(source.getPayCode());
+        this.setPaymentId(source.getPaymentId());
+        this.setPaymentType(source.getPaymentType());
+        this.setType(source.getType());
+        this.setTitle1(source.getTitle1());
+        this.setTitle2(source.getTitle2());
+        this.setPrice(source.getPrice());
+        this.setPriceExpress(source.getPriceExpress());
+        this.setNumber(source.getNumber());
+        this.setRefundNumber(source.getRefundNumber());
+        this.setPriceActual(source.getPriceActual());
+        this.setPriceRefund(source.getPriceRefund());
+        this.setUpdateAt(source.getRefundAt());
+        this.setReject(source.getReject());
+        this.setTimePay(source.getTimePay());
+        return this;
+    }
+
+
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderDetailedExportVo.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.kylin.dao.OrderExportDao;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderDetailedExportVo implements Serializable, Cloneable {
+    @Excel(name = "订单号", cellType = Excel.ColumnType.STRING)
+    private String orderCode;
+    @Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING)
+    private String code;
+    @Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING)
+    private String paymentId;
+    @Excel(name = "购买名称", cellType = Excel.ColumnType.STRING)
+    private String performanceTitle;
+    @Excel(name = "订单状态", cellType = Excel.ColumnType.STRING)
+    private String status;
+    @Excel(name = "支付平台", cellType = Excel.ColumnType.STRING)
+    private String paymentType;
+    @Excel(name = "演出类型", cellType = Excel.ColumnType.STRING)
+    private String type;
+    @Excel(name = "票种名称", cellType = Excel.ColumnType.STRING)
+    private String title1;
+    @Excel(name = "场次", cellType = Excel.ColumnType.STRING)
+    private String title2;
+    @Excel(name = "单价", cellType = Excel.ColumnType.STRING)
+    private String price;
+    @Excel(name = "快递费", cellType = Excel.ColumnType.STRING)
+    private String priceExpress;
+    @Excel(name = "购票数", cellType = Excel.ColumnType.STRING)
+    private String number;
+    @Excel(name = "退票数", cellType = Excel.ColumnType.STRING)
+    private String refundNumber;
+    @Excel(name = "实付金额", cellType = Excel.ColumnType.STRING)
+    private String priceActual;
+    @Excel(name = "退款金额", cellType = Excel.ColumnType.STRING)
+    private String priceRefund;
+    @Excel(name = "退款时间", cellType = Excel.ColumnType.STRING)
+    private String refundAt;
+    @Excel(name = "退款原因", cellType = Excel.ColumnType.STRING)
+    private String reject;
+    @Excel(name = "支付时间", cellType = Excel.ColumnType.STRING)
+    private String timePay;
+
+
+    private static final OrderDetailedExportVo obj = new OrderDetailedExportVo();
+
+    public static OrderDetailedExportVo getNew() {
+        try {
+            return (OrderDetailedExportVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new OrderDetailedExportVo();
+    }
+
+    public OrderDetailedExportVo copyOrderExportVo(OrderExportDao source) {
+        this.setOrderCode(source.getOrderCode());
+        this.setCode(source.getCode());
+        this.setPaymentId(source.getPaymentId());
+        this.setPerformanceTitle(source.getPerformanceTitle());
+        this.setStatus(source.getStatus());
+        this.setPaymentType(source.getPaymentType());
+        this.setType(source.getType());
+        this.setTitle1(source.getTitle1());
+        this.setTitle2(source.getTitle2());
+        this.setPrice(source.getPrice());
+        this.setPriceExpress(source.getPriceExpress());
+        this.setNumber(source.getNumber());
+        this.setRefundNumber(source.getRefundNumber());
+        this.setPriceActual(source.getPriceActual());
+        this.setPriceRefund(source.getPriceRefund());
+        this.setRefundAt(source.getRefundAt());
+        this.setReject(source.getReject());
+        this.setTimePay(source.getTimePay());
+        return this;
+    }
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderExportVo.java

 package com.liquidnet.client.admin.zhengzai.kylin.dto;
 
 import com.liquidnet.client.admin.common.annotation.Excel;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.kylin.dao.OrderExportDao;
 import lombok.Data;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/OrderMemberExportVo.java

+package com.liquidnet.client.admin.zhengzai.kylin.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.kylin.dao.MemberOrderExportDao;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderMemberExportVo implements Serializable, Cloneable {
+
+    @Excel(name = "商户订单号", cellType = Excel.ColumnType.STRING)
+    private String payCode;
+    @Excel(name = "微信/支付宝订单号", cellType = Excel.ColumnType.STRING)
+    private String paymentId;
+    @Excel(name = "支付方式", cellType = Excel.ColumnType.STRING)
+    private String payType;
+    @Excel(name = "订单状态", cellType = Excel.ColumnType.STRING)
+    private String state;
+    @Excel(name = "价格", cellType = Excel.ColumnType.STRING)
+    private String price;
+    @Excel(name = "支付时间", cellType = Excel.ColumnType.STRING)
+    private String paymentAt;
+    @Excel(name = "创建时间", cellType = Excel.ColumnType.STRING)
+    private String createdAt;
+    @Excel(name = "更新时间", cellType = Excel.ColumnType.STRING)
+    private String updatedAt;
+    @Excel(name = "退款时间", cellType = Excel.ColumnType.STRING)
+    private String refundAt;
+    @Excel(name = "退款金额", cellType = Excel.ColumnType.STRING)
+    private String refundPrice;
+
+    private static final OrderMemberExportVo obj = new OrderMemberExportVo();
+
+    public static OrderMemberExportVo getNew() {
+        try {
+            return (OrderMemberExportVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new OrderMemberExportVo();
+    }
+
+    public OrderMemberExportVo copyMemberOrderExportVo(MemberOrderExportDao source) {
+        this.setPayCode(source.getPayNo());
+        this.setPaymentId(source.getPaymentId());
+        this.setPayType(source.getPayType());
+        this.setState(source.getState());
+        this.setPrice(source.getPrice());
+        this.setPaymentAt(source.getPaymentAt());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setUpdatedAt(source.getUpdatedAt());
+        this.setRefundAt(source.getRefundAt());
+        this.setRefundPrice(source.getRefundPrice());
+        return this;
+    }
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/IExportService.java

 package com.liquidnet.client.admin.zhengzai.kylin.service;
 
-import com.github.pagehelper.PageInfo;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderExportVo;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.*;
 
 import java.util.List;
 
@@ -11,4 +9,19 @@ public interface IExportService {
     List<OrderExportVo> exportOrderByPerformanceIdAll(String performancesId);
 
     List<OrderExportVo> exportOrderByPerformanceIdPay(String performancesId);
+
+    //根据订单时间导出信息
+    List<OrderDetailedExportVo> exportOrderByOrderTime(String beginTime, String endTime);
+
+    //根据演出时间导出信息
+    List<OrderDetailedByShowDateExportVo> exportOrderByShowTime(String beginTime, String endTime);
+
+    //根据演出id导出信息
+    List<OrderDetailedByShowIdExportVo> exportOrderByShowId(String showId);
+
+    //导出会员订单信息
+    List<OrderMemberExportVo> exportMemberOrder(String beginTime, String endTime);
+
+    //导出商品订单信息
+    List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/ExportServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.exception.BusinessException;
-import com.liquidnet.client.admin.common.utils.StringUtils;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderExportVo;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.*;
 import com.liquidnet.client.admin.zhengzai.kylin.service.IExportService;
-import com.liquidnet.client.admin.zhengzai.kylin.service.IImportService;
-import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
-import com.liquidnet.client.admin.zhengzai.kylin.utils.OrderUtils;
-import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
-import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dao.CommodityOrderExportDao;
+import com.liquidnet.service.kylin.dao.MemberOrderExportDao;
 import com.liquidnet.service.kylin.dao.OrderExportDao;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
-import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
-import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
-import com.liquidnet.service.kylin.entity.*;
-import com.liquidnet.service.kylin.mapper.*;
-import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.util.MultiValueMap;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -49,7 +29,7 @@ public class ExportServiceImpl implements IExportService {
     public List<OrderExportVo> exportOrderByPerformanceIdAll(String performancesId) {
         List<OrderExportDao> list = performancesMapper.exportOrderByPerformanceIdAll(performancesId);
         List<OrderExportVo> voList = new ArrayList();
-        for (OrderExportDao item :list){
+        for (OrderExportDao item : list) {
             voList.add(OrderExportVo.getNew().copyOrderExportVo(item));
         }
         return voList;
@@ -59,9 +39,91 @@ public class ExportServiceImpl implements IExportService {
     public List<OrderExportVo> exportOrderByPerformanceIdPay(String performancesId) {
         List<OrderExportDao> list = performancesMapper.exportOrderByPerformanceIdPay(performancesId);
         List<OrderExportVo> voList = new ArrayList();
-        for (OrderExportDao item :list){
+        for (OrderExportDao item : list) {
             voList.add(OrderExportVo.getNew().copyOrderExportVo(item));
         }
         return voList;
     }
+
+    @Override
+    public List<OrderDetailedExportVo> exportOrderByOrderTime(String beginTime, String endTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date beginDate = sdf.parse(beginTime);
+            Date endDate = sdf.parse(endTime);
+            List<OrderExportDao> list = performancesMapper.exportOrderByOrderTime(beginDate, endDate);
+            List<OrderDetailedExportVo> voList = new ArrayList();
+            for (OrderExportDao item : list) {
+                voList.add(OrderDetailedExportVo.getNew().copyOrderExportVo(item));
+            }
+            return voList;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("导出异常，请联系网站管理员！");
+        }
+    }
+
+    @Override
+    public List<OrderDetailedByShowDateExportVo> exportOrderByShowTime(String beginTime, String endTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date beginDate = sdf.parse(beginTime);
+            Date endDate = sdf.parse(endTime);
+            List<OrderExportDao> list = performancesMapper.exportOrderByShowTime(beginDate, endDate);
+            List<OrderDetailedByShowDateExportVo> voList = new ArrayList();
+            for (OrderExportDao item : list) {
+                voList.add(OrderDetailedByShowDateExportVo.getNew().copyOrderExportVo(item));
+            }
+            return voList;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("导出异常，请联系网站管理员！");
+        }
+    }
+
+    @Override
+    public List<OrderDetailedByShowIdExportVo> exportOrderByShowId(String showId) {
+        List<OrderExportDao> list = performancesMapper.exportOrderByShowId(showId);
+        List<OrderDetailedByShowIdExportVo> voList = new ArrayList();
+        for (OrderExportDao item : list) {
+            voList.add(OrderDetailedByShowIdExportVo.getNew().copyOrderExportVo(item));
+        }
+        return voList;
+    }
+
+    @Override
+    public List<OrderMemberExportVo> exportMemberOrder(String beginTime, String endTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date beginDate = sdf.parse(beginTime);
+            Date endDate = sdf.parse(endTime);
+            List<MemberOrderExportDao> list = performancesMapper.exportMemberOrder(beginDate, endDate);
+            List<OrderMemberExportVo> voList = new ArrayList();
+            for (MemberOrderExportDao item : list) {
+                voList.add(OrderMemberExportVo.getNew().copyMemberOrderExportVo(item));
+            }
+            return voList;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("导出异常，请联系网站管理员！");
+        }
+    }
+
+    @Override
+    public List<OrderCommodityExportVo> exportCommodityOrder(String beginTime, String endTime) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        try {
+            Date beginDate = sdf.parse(beginTime);
+            Date endDate = sdf.parse(endTime);
+            List<CommodityOrderExportDao> list = performancesMapper.exportCommodityOrder(beginDate, endDate);
+            List<OrderCommodityExportVo> voList = new ArrayList();
+            for (CommodityOrderExportDao item : list) {
+                voList.add(OrderCommodityExportVo.getNew().copyCommodityOrderExportVo(item));
+            }
+            return voList;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            throw new BusinessException("导出Excel失败，请联系网站管理员！");
+        }
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -864,6 +864,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 }
                 HashMap<String, Object> mapMongo = new HashMap<>();
                 mapMongo.put("useStart", ticketVo.getUseStart());
+                mapMongo.put("timeStart", vo.getTimeStart());
                 long time1 = System.currentTimeMillis();
                 mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateMany(
                         Query.query(Criteria.where("orderTicketsId").in(orderTicketIdList)).getQueryObject(),

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-client-job.yml

@@ -10,7 +10,7 @@ spring:
   cloud:
     config:
 #      uri: http://127.0.0.1:7002/support-config
-#      uri: http://39.106.122.201:7002/support-config
+#      uri: http://39.107.71.112:7002/support-config
       profile: ${liquidnet.cloudConfig.profile}
       name: ${spring.application.name} #默认为spring.application.name
       discovery:

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CollectionUtil.java

@@ -9,7 +9,10 @@ import java.util.function.Predicate;
 public class CollectionUtil {
     private static final HashMap<String, String> STRING_STRING_HASH_MAP = new HashMap<>();
     private static final HashMap<String, Object> STRING_OBJECT_HASH_MAP = new HashMap<>();
+    private static final HashMap<String, List<String>> STRING_LIST_HASH_MAP = new HashMap<>();
     private static final HashMap<String, Integer> STRING_INTEGER_HASH_MAP = new HashMap<>();
+    private static final HashMap<String, BigDecimal> STRING_BIG_DECIMAL_HASH_MAP = new HashMap<>();
+    private static final HashMap<String, Map<String, Object>> STRING_MAP_HASH_MAP = new HashMap<>();
     private static final LinkedList<String> STRING_LINKED_LIST = new LinkedList<>();
     private static final LinkedList<Object[]> OBJECTS_LINKED_LIST = new LinkedList<>();
     private static final LinkedMultiValueMap<String, String> STRING_STRING_LINKED_MULTI_VALUE_MAP = new LinkedMultiValueMap<>();
@@ -20,10 +23,12 @@ public class CollectionUtil {
     private static final ArrayList<BigDecimal> BIG_DECIMALS_ARRAY_LIST = new ArrayList<>();
     private static final ArrayList<BigDecimal> BIGDECIMAL_ARRAY_LIST = new ArrayList<>();
 
-
     public static HashMap<String, String> mapStringString() {
         return (HashMap<String, String>) STRING_STRING_HASH_MAP.clone();
     }
+    public static HashMap<String, List<String>> mapStringList() {
+        return (HashMap<String, List<String>>) STRING_LIST_HASH_MAP.clone();
+    }
 
     public static HashMap<String, Object> mapStringObject() {
         return (HashMap<String, Object>) STRING_OBJECT_HASH_MAP.clone();
@@ -33,6 +38,14 @@ public class CollectionUtil {
         return (HashMap<String, Integer>) STRING_INTEGER_HASH_MAP.clone();
     }
 
+    public static HashMap<String, BigDecimal> mapStringBigDecimal() {
+        return (HashMap<String, BigDecimal>) STRING_BIG_DECIMAL_HASH_MAP.clone();
+    }
+
+    public static HashMap<String, Map<String, Object>> mapHashMap() {
+        return (HashMap<String, Map<String, Object>>) STRING_MAP_HASH_MAP.clone();
+    }
+
     public static LinkedList<String> linkedListString() {
         return (LinkedList<String>) STRING_LINKED_LIST.clone();
     }

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

@@ -104,8 +104,8 @@ public class HttpUtil {
 
     public static String postJson(String url, String jsonStr, MultiValueMap<String, String> headers) {
         MultiValueMap<String, String> commonHeader = CollectionUtil.linkedMultiValueMapStringString();
-        headers.add("Content-Type", MediaType.APPLICATION_JSON_UTF8_VALUE);
-        headers.add("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
+        commonHeader.add("Content-Type", MediaType.APPLICATION_JSON_UTF8_VALUE);
+        commonHeader.add("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
 
         if (url == null || url.trim().isEmpty()) {
             return null;
@@ -119,6 +119,7 @@ public class HttpUtil {
         if (headers != null) {
             httpHeaders.addAll(headers);
         }
+
         HttpEntity<Object> httpEntity = new HttpEntity(jsonStr, httpHeaders);
 
         // 提交方式：表单、json

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/IDGenerator.java

@@ -149,4 +149,35 @@ public class IDGenerator {
     public static void main(String[] args) {
         System.out.println(getWriteOffCode());
     }
+
+    /**
+     * 获取兑换码
+     * @param num 次数
+     * @param sec 单次巡管
+     * @param bol 是否添加特殊字符
+     * @return
+     */
+    public static String createCode(int num,int sec,boolean bol) {
+        StringBuffer str = new StringBuffer();
+        for (int k=0;k<num;k++) {
+            for(int i=0;i < sec;i++){
+                int intVal=(int)(Math.random()*58+65);
+                if(intVal >= 91 && intVal <= 122){
+                    i--;
+                }
+                if(intVal < 91 || intVal > 122){
+                    if(intVal%2==0){
+                        str.append((char)intVal);
+                    }else{
+                        str.append((int)(Math.random()*10));
+                    }
+                }
+            }
+            if(bol){
+                str.append("-");
+            }
+        }
+        return str.toString()+"CH";
+    }
+
 }

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/config/RedisStreamConfig.java

@@ -41,7 +41,7 @@ public class RedisStreamConfig {
                 stringObjectObjectStreamOperations.delete(key, recordId.getValue());
             }
         } catch (Exception e) {
-            log.error("Ex:redis stream init [{},{}],ex:{}", key, group, e.getMessage());
+            log.warn("###Ex:redis stream init [{},{}],ex:{}", key, group, e.getMessage());
         }
     }
 

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -48,7 +48,7 @@ public class MQConst {
         SQL_ORDER_WITHDRAW("kylin:stream:rk.order.withdraw", "group.order.withdraw", "订单申请撤回"),
         SQL_ORDER_OVERTIME_REFUND("kylin:stream:rk.order.overtime.refund", "group.order.overtime.refund", "超时支付申请退款"),
         SQL_STATION("kylin:stream:rk.station", "group.station", "验票更新"),
-        SQL_TRANSFER("kylin:stream:rk.transfer", "group.transfer", "订单发起转赠"),
+        SQL_TRANSFER("kylin:stream:rk.transfer", "group.transfer", "订单发起转赠/万青补偿快递"),
         SQL_TRANSFER_RESULT("kylin:stream:rk.transfer.result", "group.transfer.result", "订单结果转赠"),
         SQL_TRANSFER_OVERTIME("kylin:stream:rk.transfer.overtime", "group.transfer.overtime", "订单结果转赠"),
         ;
@@ -268,13 +268,14 @@ public class MQConst {
         GOBLIN_STORE_MARKET("goblin:stream:store.market", "group.store.market", "店铺活动"),
         GOBLIN_SELF_MARKET("goblin:stream:self.market", "group.self.market", "平台活动"),
         GOBLIN_ORDER_CREATE_PAY("goblin:stream:order:create_pay", "group.order:create_pay", "订单创建&支付"),
-        GOBLIN_NFT_ORDER("goblin:stream:nftOrder:create", "group.nftOrder:create", "NFT订单处理"),
         GOBLIN_SHOP_CART("goblin:stream:sql.shopcart","group.shop.shopcart","购物车"),
         GOBLIN_ORDER_AGAIN("goblin:stream:order:again", "group.order:again", "订单再次支付"),
         GOBLIN_ORDER_CLOSE("goblin:stream:order:close", "group.order:close", "订单关闭"),
         GOBLIN_STORE_ORDER_OPERA("goblin:stream:order:store", "group.order:store", "商铺订单操作"),
         GOBLIN_USER_ORDER_OPERA("goblin:stream:order:user", "group.order:user", "用户订单操作"),
         GOBLIN_XLS_OPERA("goblin:stream:xls", "group.xls", "xls文件操作"),
+        GOBLIN_PHONE_CODE_OPERA("goblin:stream:phone:code","group.phone:code","批量空投操作"),
+        GOBLIN_CODE_OPERA("goblin:stream:code","group.code","修改兑换码操作人"),
 
         GOBLIN_UN_PAY_0("goblin:stream:order:back:0", "group.order:back", "回滚关闭订单库存队列"),
         GOBLIN_UN_PAY_1("goblin:stream:order:back:1", "group.order:back", "回滚关闭订单库存队列"),
@@ -291,6 +292,11 @@ public class MQConst {
         BIZ_ARTWORK_CLQ("goblin:stream:biz_art:clq", "group.biz.artwork", "藏品声明查询"),
         BIZ_ARTWORK_GEN("goblin:stream:biz_art:gen", "group.biz.artwork", "藏品生成"),
         SQL_ARTWORK_GEN("goblin:stream:sql_art:gen", "group.biz.artwork", "藏品生成"),
+
+        GOBLIN_NFT_ORDER("goblin:stream:nftOrder:create", "group.nftOrder:create", "NFT订单处理"),
+        BIZ_INTEGRAL("goblin:stream:biz_integral", "group.biz.integral", "增减积分操作"),
+        BIZ_NFT_MONGO("goblin:stream:biz:mongo:nft", "group.biz.mongo.nft", "NFT的mongo操作"),
+
         ;
 
         private final String key;

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-zxlnft/src/main/java/com/liquidnet/common/third/zxlnft/util/ZxlnftSdkUtil.java

@@ -716,7 +716,8 @@ public class ZxlnftSdkUtil {
             BeanUtil.copy(reqDto,req);
             req.setPubKey(zxlnftConfig.getNftPlatformPubKey());
             req.setPlatformPubKey(zxlnftConfig.getNftPlatformPubKey());
-            req.setHash(zxlnftBiz.getHashString(req.getUrl()));
+//            req.setHash(zxlnftBiz.getHashString(req.getUrl()));
+            req.setHash(reqDto.getMetaData());
 
             /**
              * 发行人的私钥签名，签名对象是(platformPubKey_pubKey_接口名_author_name_url_displayUrl_hash_desc_flag_publishCount_seriesId_seriesBeginIndex

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -100,6 +100,7 @@ liquidnet:
     smile:
       url: http://devsmile.zhengzai.tv
     order:
+      url: http://devorder.zhengzai.tv
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         applePay: http://devdragon.zhengzai.tv/dragon/notify/apple/purchase

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -100,6 +100,7 @@ liquidnet:
     smile:
       url: http://testsmile.zhengzai.tv
     order:
+      url: http://testorder.zhengzai.tv
       url-pay:
         pay: http://testdragon.zhengzai.tv/dragon/pay/dragonPay
         applePay: http://testdragon.zhengzai.tv/dragon/notify/apple/purchase

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-dev.yml

@@ -7,8 +7,6 @@ liquidnet:
     logfile:
         path: /data/logs
         name: client-admin-web
-        config: classpath:logback-spring.xml
-        file-max-size: 200MB
         level: debug
     mysql:
         master:

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-druid-dev.yml

@@ -23,7 +23,7 @@ spring:
             # 最大连接池数量
             maxActive: 20
             # 配置获取连接等待超时的时间
-            maxWait: 60000
+            maxWait: 300000
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
             timeBetweenEvictionRunsMillis: 60000
             # 配置一个连接在池中最小生存的时间，单位是毫秒

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-druid-test.yml

@@ -23,7 +23,7 @@ spring:
             # 最大连接池数量
             maxActive: 20
             # 配置获取连接等待超时的时间
-            maxWait: 60000
+            maxWait: 300000
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
             timeBetweenEvictionRunsMillis: 60000
             # 配置一个连接在池中最小生存的时间，单位是毫秒

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web-test.yml

@@ -7,9 +7,7 @@ liquidnet:
     logfile:
         path: /data/logs
         name: client-admin-web
-        config: classpath:logback-spring.xml
-        file-max-size: 200MB
-        level: debug
+        level: info
     mysql:
         master:
             urlHostAndPort: ${liquidnet.mysql.urlHostAndPort}

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -41,24 +41,6 @@ logging:
   level:
     com.ruoyi: info
     org.springframework: warn
-#logging:
-#  #  config: ${liquidnet.logfile.config}
-#  file:
-#    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-#    max-size: 200MB
-#  pattern:
-#    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{56}:%line] - %msg%n'
-#    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{56}:%line] - %msg%n'
-#    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-#  level:
-#    root: info
-#    #以下是为指定包设置日志级别
-#    com:
-#      liquidnet:
-#        client:
-#          admin: debug
-#    org:
-#      springframework: warn
 
 # -----------------------------------------------------------
 

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-dev.yml

@@ -6,5 +6,7 @@ liquidnet:
   logfile:
     name: client-job
     path: /data/logs
+    max-history: 7
+    level: debug
   mysql:
     database-name: dev_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-job-test.yml

@@ -6,5 +6,7 @@ liquidnet:
   logfile:
     name: client-job
     path: /data/logs
+    max-history: 7
+    level: info
   mysql:
     database-name: test_ln_clijob
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-job.yml

@@ -109,11 +109,12 @@ xxl:
 logging:
   file:
     max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
   level:
-    root: info
-    com:
-      liquidnet: info
+    root: error
+    com.liquidnet.service.feign: error
+    com.liquidnet: ${liquidnet.logfile.level}
   pattern:
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -9,8 +9,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-adam
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
+    max-history: 7
     level: debug
   mysql:
     database-name: dev_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -9,8 +9,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-adam
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
+    max-history: 7
     level: info
   mysql:
     database-name: test_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -22,7 +22,8 @@ logging:
 #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: ${liquidnet.logfile.file-max-size}
+    max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
@@ -57,8 +58,8 @@ info:
     artifactId: '@project.artifactId@'
     version: '@project.version@'
 # -----------------------------------------------------------
-mybatis-plus:
-  mapper-locations: classpath:com.liquidnet.service.adam.mapper/*Mapper.xml
+#mybatis-plus:
+#  mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml
 # -----------------------------------------------------------
 spring:
   application:

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy-dev.yml

@@ -9,8 +9,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-candy
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
+    max-history: 7
     level: debug
   mysql:
     database-name: dev_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy-test.yml

@@ -9,8 +9,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-candy
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
+    max-history: 7
     level: info
   mysql:
     database-name: test_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-candy.yml

@@ -22,7 +22,8 @@ logging:
   #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: ${liquidnet.logfile.file-max-size}
+    max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
@@ -57,8 +58,8 @@ info:
     artifactId: '@project.artifactId@'
     version: '@project.version@'
 # -----------------------------------------------------------
-mybatis-plus:
-  mapper-locations: classpath:com.liquidnet.service.candy.mapper/*Mapper.xml
+#mybatis-plus:
+#  mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml
 # -----------------------------------------------------------
 spring:
   application:

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime-dev.yml

@@ -9,8 +9,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-chime
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
+    max-history: 7
     level: debug
   mongodb:
     sslEnabled: false

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime-test.yml

@@ -9,8 +9,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-chime
-    config: classpath:logback-spring.xml
-    file-max-size: 200MB
+    max-history: 7
     level: info
   mongodb:
     sslEnabled: false

liquidnet-bus-config/liquidnet-config/liquidnet-service-chime.yml

@@ -22,7 +22,8 @@ logging:
 #  config: ${liquidnet.logfile.config}
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: ${liquidnet.logfile.file-max-size}
+    max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{56}:%line] - %msg%n'
@@ -57,8 +58,8 @@ info:
     artifactId: '@project.artifactId@'
     version: '@project.version@'
 # -----------------------------------------------------------
-mybatis-plus:
-  mapper-locations: classpath:com.liquidnet.service.order.mapper/*Mapper.xml
+#mybatis-plus:
+#  mapper-locations: classpath*:com.liquidnet.service.*.mapper/*Mapper.xml
 # -----------------------------------------------------------
 spring:
   application:

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam-dev.yml

@@ -10,7 +10,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-consumer-adam
-    config: classpath:logback-spring.xml
+    max-history: 7
     level: debug
   mysql:
     database-name: dev_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam-test.yml

@@ -10,7 +10,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-consumer-adam
-    config: classpath:logback-spring.xml
+    max-history: 7
     level: info
   mysql:
     database-name: test_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-adam.yml

@@ -17,6 +17,7 @@ logging:
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
@@ -24,6 +25,7 @@ logging:
   level:
     root: error
     #以下是为指定包设置日志级别
+    com.liquidnet.service.feign: error
     com.liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------
 eureka:

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-candy-dev.yml

@@ -10,7 +10,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-consumer-candy
-    config: classpath:logback-spring.xml
+    max-history: 7
     level: debug
   mysql:
     database-name: dev_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-candy-test.yml

@@ -10,7 +10,7 @@ liquidnet:
   logfile:
     path: /data/logs
     name: service-consumer-candy
-    config: classpath:logback-spring.xml
+    max-history: 7
     level: info
   mysql:
     database-name: test_ln_scene

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-candy.yml

@@ -17,6 +17,7 @@ logging:
   file:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: 200MB
+    max-history: ${liquidnet.logfile.max-history}
   pattern:
     file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
     console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{36}:%line] - %msg%n'
@@ -24,6 +25,7 @@ logging:
   level:
     root: error
     #以下是为指定包设置日志级别
+    com.liquidnet.service.feign: error
     com.liquidnet: ${liquidnet.logfile.level}
 # -----------------------------------------------------------
 eureka: