拆分sweet:do:api;

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -20,61 +20,6 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_ALL = "sweet:luckDraw:num:";//中奖总量
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_PRESENT_MOBILE = "sweet:luckDraw:present:mobile:";//中奖库存
 
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO="sweet:wechatUser:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_STR="sweet:wechatUser:unionIdStr:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID="sweet:wechatUser:openId:";
-    public final static String REDIS_KEY_SWEET_ANSWER_PHONE="sweet:answer:phone:";
-
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE="sweet:wechatUser:phone:";
-
-
-//    public enum ManualPosition {
-//        artist("艺人","artist"),
-//        signingTime("签售时间","signingTime"),
-//        foodAndAmusement("吃喝玩乐","foodAndAmusement"),
-//        siteMap("现场地图","siteMap"),
-//        howToReach("如何到达","howToReach"),
-//        relatedProduct ("官方售卖","relatedProduct"),
-//        officialSupport("官方支持","officialSupport"),
-//        audienceNotice("观众须知","audienceNotice"),
-//        preventionGuidelines("防疫指南","preventionGuidelines"),
-//        notice("通知","notice"),
-//        strategy("观演攻略","strategy");
-//
-//        private String message;
-//        private String code;
-//
-//        private ManualPosition(String message, String code) {
-//            this.message = message;
-//            this.code = code;
-//        }
-//
-//        public void setCode(String code) {
-//            this.code = code;
-//        }
-//
-//        public String getCode() {
-//            return code;
-//        }
-//
-//        public void setMessage(String message) {
-//            this.message = message;
-//        }
-//
-//        public String getMessage() {
-//            return message;
-//        }
-//
-//        public static String getMessage(String code) {
-//            for (ManualPosition c : ManualPosition.values()) {
-//                if (c.getCode().equalsIgnoreCase(code)) {
-//                    return c.message;
-//                }
-//            }
-//            return null;
-//        }
-//    }
-
 
     public final static String REDIS_KEY_SWEET_MDSK_MANUAL_PUSH_LIST = "sweet:mdsk:manual:pushList";
     public final static String REDIS_KEY_SWEET_MDSK_MANUAL_TIME_LIST = "sweet:mdsk:manual:timeList:manual:";
@@ -86,9 +31,33 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_MDSK_SHOP = "sweet:mdsk:artists:shop:manual:";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST = "sweet:integralActivity:list";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO = "sweet:integralActivity:activityId:";
+
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM = "sweet:integralActivity:prizeNum:activityId:";
+
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_WINNERS_NUM = "sweet:integralActivity:prizeWinnersNum:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER = "sweet:integralActivity:DrawIn:activityId:";
     public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO = "sweet:integralActivity:DrawInfo:drawId:";
 
+
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO="sweet:wechatUser:zhengzai:unionId:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY="sweet:wechatUser:modernsky:unionId:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID="sweet:wechatUser:zhengzai:openId:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_MODERNSKY="sweet:wechatUser:modernsky:openId:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE="sweet:wechatUser:zhengzai:phone:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY="sweet:wechatUser:modernsky:phone:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID="sweet:wechatUser:zhengzai:uid:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY="sweet:wechatUser:modernsky:uid:";
+
+    public final static String REDIS_KEY_SWEET_ANSWER_PHONE="sweet:answer:phone:";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST=":StatList";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE=":cityCode:";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE="sweet:cityVote";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_USER=":user:";
+    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME=":updateTime";
+
+
+    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_ALL_LIST = "sweet:integralActivity:Draw:activityId:";
+
+    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER = "sweet:integralActivity:Draw:activityId:";
+    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER = "sweet:integralActivity:DrawIn:activityId:";
+
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/param/SweetOpenSendMsgParam.java → liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/param/SweetOpenSendMsgParam.java

@@ -4,7 +4,10 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @ApiModel(value = "SweetOpenSendMsgParam", description = "发送模版消息公共接口入参")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetCItyVoteStatVo.java → liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetCItyVoteStatVo.java

 package com.liquidnet.service.sweet.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.liquidnet.service.sweet.dto.SweetCityVoteStatDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 @Data
 public class SweetCItyVoteStatVo implements Serializable, Cloneable {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetManualShopMdskAllVo.java → liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetManualShopMdskAllVo.java

 package com.liquidnet.service.sweet.vo;
 
-import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetPrizeVo.java → liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetPrizeVo.java

 package com.liquidnet.service.sweet.vo;
 
-import com.liquidnet.service.sweet.entity.SweetAnswer;
-import io.swagger.annotations.Api;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 @Data
 public class SweetPrizeVo implements Serializable, Cloneable {

liquidnet-bus-do/liquidnet-service-sweet-do/pom.xml

@@ -15,13 +15,16 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>2.10.1</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-common-base</artifactId>
             <version>1.0-SNAPSHOT</version>
-            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring</artifactId>
+            <version>2.0.7</version>
         </dependency>
     </dependencies>
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualAppletDto.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetManualAppletDto.java

 package com.liquidnet.service.sweet.dto;
 
-import com.liquidnet.service.sweet.entity.SweetManualSort;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +9,7 @@ import java.io.Serializable;
 @Data
 @ApiModel
 public class SweetManualAppletDto implements Serializable ,Cloneable{
+    private static final long serialVersionUID = -2815790292441892142L;
     @ApiModelProperty("电子手册id")
     private String manualId;
     @ApiModelProperty("演出id")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListDto.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListDto.java

@@ -5,12 +5,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 
 @Data
 @ApiModel
 public class SweetManualArtistListDto implements Serializable,Cloneable {
-
+    private static final long serialVersionUID = -2973233311395690900L;
     @ApiModelProperty("电子手册关联id")
     private String manualRelationId;
     @ApiModelProperty("艺人id")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListMDSKDto.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListMDSKDto.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 @Data
 @ApiModel
 public class SweetManualArtistListMDSKDto implements Serializable,Cloneable {
-
+    private static final long serialVersionUID = 8382714055996962257L;
     @ApiModelProperty("电子手册关联id")
     private String manualRelationId;
     @ApiModelProperty("艺人id")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistStageListDto.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistStageListDto.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.sweet.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 
 @Data
 public class SweetManualArtistStageListDto implements Serializable ,Cloneable{

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetAnswer.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetAnswer.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 答题表

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetAppletUser.java

 package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 小程序登录记录用户解密后信息表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetArtists.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetArtists.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 艺人表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetCityVote.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetCityVote.java

 package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 城市投票表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetCityVoteStat.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetCityVoteStat.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 城市投票统计表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManual.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManual.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子宣传手册表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualArtists.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualArtists.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子宣传手册艺人表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualArtistsMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualArtistsMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 电子宣传手册艺人表
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetManualArtistsMdsk implements Serializable ,Cloneable{
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * manual_relation_id
-     */
-    private String manualRelationId;
-
-    /**
-     * 电子宣传手册id
-     */
-    private String manualId;
-
-    /**
-     * 关联id
-     */
-    private String stageId;
-
-    /**
-     * 关联id
-     */
-    private String artistsId;
-
-    /**
-     * 演出开始时间
-     */
-    private LocalDateTime performanceStart;
-
-    /**
-     * 演出结束时间
-     */
-    private LocalDateTime performanceEnd;
-
-    /**
-     * 签收开始时间
-     */
-    private LocalDateTime signatureStart;
-
-    /**
-     * 签收结束时间
-     */
-    private LocalDateTime signatureEnd;
-
-    /**
-     * 0关闭 1开启
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetManualArtistsMdsk obj = new SweetManualArtistsMdsk();
-    public static SweetManualArtistsMdsk getNew() {
-        try {
-            return (SweetManualArtistsMdsk) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetManualArtistsMdsk();
-        }
-    }
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册艺人表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetManualArtistsMdsk implements Serializable ,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * manual_relation_id
+     */
+    private String manualRelationId;
+
+    /**
+     * 电子宣传手册id
+     */
+    private String manualId;
+
+    /**
+     * 关联id
+     */
+    private String stageId;
+
+    /**
+     * 关联id
+     */
+    private String artistsId;
+
+    /**
+     * 演出开始时间
+     */
+    private LocalDateTime performanceStart;
+
+    /**
+     * 演出结束时间
+     */
+    private LocalDateTime performanceEnd;
+
+    /**
+     * 签收开始时间
+     */
+    private LocalDateTime signatureStart;
+
+    /**
+     * 签收结束时间
+     */
+    private LocalDateTime signatureEnd;
+
+    /**
+     * 0关闭 1开启
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetManualArtistsMdsk obj = new SweetManualArtistsMdsk();
+    public static SweetManualArtistsMdsk getNew() {
+        try {
+            return (SweetManualArtistsMdsk) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualArtistsMdsk();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 电子宣传手册表
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetManualMdsk implements Serializable,Cloneable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * manual_id
-     */
-    private String manualId;
-
-    /**
-     * 演出id
-     */
-    private String performanceId;
-
-    /**
-     * 0关闭 1开启
-     */
-    private Integer status;
-
-    /**
-     * 0取消 1发布
-     */
-    private Integer isRelease;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetManualMdsk obj = new SweetManualMdsk();
-    public static SweetManualMdsk getNew() {
-        try {
-            return (SweetManualMdsk) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetManualMdsk();
-        }
-    }
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetManualMdsk implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * manual_id
+     */
+    private String manualId;
+
+    /**
+     * 演出id
+     */
+    private String performanceId;
+
+    /**
+     * 0关闭 1开启
+     */
+    private Integer status;
+
+    /**
+     * 0取消 1发布
+     */
+    private Integer isRelease;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetManualMdsk obj = new SweetManualMdsk();
+    public static SweetManualMdsk getNew() {
+        try {
+            return (SweetManualMdsk) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualMdsk();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualNotify.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualNotify.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子宣传手册通知表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualNotifyMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualNotifyMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 电子宣传手册通知表
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetManualNotifyMdsk implements Serializable ,Cloneable{
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * manual_notify_id
-     */
-    private String manualNotifyId;
-
-    /**
-     * 电子宣传手册id
-     */
-    private String manualId;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 0关闭 1开启
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetManualNotifyMdsk obj = new SweetManualNotifyMdsk();
-    public static SweetManualNotifyMdsk getNew() {
-        try {
-            return (SweetManualNotifyMdsk) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetManualNotifyMdsk();
-        }
-    }
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册通知表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetManualNotifyMdsk implements Serializable ,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * manual_notify_id
+     */
+    private String manualNotifyId;
+
+    /**
+     * 电子宣传手册id
+     */
+    private String manualId;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 0关闭 1开启
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetManualNotifyMdsk obj = new SweetManualNotifyMdsk();
+    public static SweetManualNotifyMdsk getNew() {
+        try {
+            return (SweetManualNotifyMdsk) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualNotifyMdsk();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualShop.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualShop.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子宣传手册商铺表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualShopMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualShopMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 电子宣传手册商铺表
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetManualShopMdsk implements Serializable,Cloneable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * manual_shop_id
-     */
-    private String manualShopId;
-
-    /**
-     * 电子宣传手册id
-     */
-    private String manualId;
-
-    /**
-     * 商家名称
-     */
-    private String title;
-
-    /**
-     * 商家图片
-     */
-    private String picUrl;
-
-    /**
-     * 商家介绍
-     */
-    private String describes;
-
-    /**
-     * 1吃喝 2玩乐
-     */
-    private Integer type;
-
-    /**
-     * 0不推荐 1推荐
-     */
-    private Integer isRecommend;
-
-    /**
-     * 排序字段 数字越大越靠前
-     */
-    private Integer sort;
-
-    /**
-     * 0关闭 1开启
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetManualShopMdsk obj = new SweetManualShopMdsk();
-    public static SweetManualShopMdsk getNew() {
-        try {
-            return (SweetManualShopMdsk) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetManualShopMdsk();
-        }
-    }
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册商铺表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetManualShopMdsk implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * manual_shop_id
+     */
+    private String manualShopId;
+
+    /**
+     * 电子宣传手册id
+     */
+    private String manualId;
+
+    /**
+     * 商家名称
+     */
+    private String title;
+
+    /**
+     * 商家图片
+     */
+    private String picUrl;
+
+    /**
+     * 商家介绍
+     */
+    private String describes;
+
+    /**
+     * 1吃喝 2玩乐
+     */
+    private Integer type;
+
+    /**
+     * 0不推荐 1推荐
+     */
+    private Integer isRecommend;
+
+    /**
+     * 排序字段 数字越大越靠前
+     */
+    private Integer sort;
+
+    /**
+     * 0关闭 1开启
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetManualShopMdsk obj = new SweetManualShopMdsk();
+    public static SweetManualShopMdsk getNew() {
+        try {
+            return (SweetManualShopMdsk) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualShopMdsk();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualSort.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualSort.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子宣传手册显示内容表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualSortMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetManualSortMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 电子宣传手册显示内容表
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetManualSortMdsk implements Serializable,Cloneable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * manual_id
-     */
-    private String manualId;
-
-    /**
-     * 显示哪个，号隔开
-     */
-    private String showPosition;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetManualSortMdsk obj = new SweetManualSortMdsk();
-    public static SweetManualSortMdsk getNew() {
-        try {
-            return (SweetManualSortMdsk) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetManualSortMdsk();
-        }
-    }
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册显示内容表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetManualSortMdsk implements Serializable,Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * manual_id
+     */
+    private String manualId;
+
+    /**
+     * 显示哪个，号隔开
+     */
+    private String showPosition;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetManualSortMdsk obj = new SweetManualSortMdsk();
+    public static SweetManualSortMdsk getNew() {
+        try {
+            return (SweetManualSortMdsk) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualSortMdsk();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetRemind.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetRemind.java

 package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 提醒记录表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetRichtext.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetRichtext.java

@@ -2,13 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 电子宣传手册富文本表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetRichtextMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetRichtextMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 电子宣传手册富文本表
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetRichtextMdsk implements Serializable ,Cloneable{
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * order_refund_id
-     */
-    private String richtextId;
-
-    /**
-     * manual_id
-     */
-    private String manualId;
-
-    /**
-     * 富文本详情
-     */
-    private String details;
-
-    /**
-     * 经纬度 5需要
-     */
-    private String local;
-
-    /**
-     * 地图图片地址 2需要
-     */
-    private String picUrl;
-
-    /**
-     * 类型 1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略
-     */
-    private Integer type;
-
-    /**
-     * 0关闭 1开启
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetRichtextMdsk obj = new SweetRichtextMdsk();
-    public static SweetRichtextMdsk getNew() {
-        try {
-            return (SweetRichtextMdsk) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetRichtextMdsk();
-        }
-    }
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 电子宣传手册富文本表
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetRichtextMdsk implements Serializable ,Cloneable{
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * order_refund_id
+     */
+    private String richtextId;
+
+    /**
+     * manual_id
+     */
+    private String manualId;
+
+    /**
+     * 富文本详情
+     */
+    private String details;
+
+    /**
+     * 经纬度 5需要
+     */
+    private String local;
+
+    /**
+     * 地图图片地址 2需要
+     */
+    private String picUrl;
+
+    /**
+     * 类型 1签售时间 2现场地图 3官方大巴 4公共交通 5自驾导航坐标 6官方支持 7观众须知 8防疫指南 9观演攻略
+     */
+    private Integer type;
+
+    /**
+     * 0关闭 1开启
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetRichtextMdsk obj = new SweetRichtextMdsk();
+    public static SweetRichtextMdsk getNew() {
+        try {
+            return (SweetRichtextMdsk) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetRichtextMdsk();
+        }
+    }
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetStage.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetStage.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 舞台表

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetUserRelation.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetUserRelation.java

@@ -2,11 +2,12 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 用户 收藏/喜欢等状态

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetUserRelationMdsk.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetUserRelationMdsk.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 用户 收藏/喜欢等状态
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetUserRelationMdsk implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * 用户id
-     */
-    private String userId;
-
-    /**
-     * 类型 1喜欢艺人  2签售艺人
-     */
-    private Integer type;
-
-    /**
-     * 目标id
-     */
-    private String targetId;
-
-    /**
-     * 电子手册
-     */
-    private String manualId;
-
-    /**
-     * 1是 0否
-     */
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-
-}
+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetUserRelationMdsk implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 类型 1喜欢艺人  2签售艺人
+     */
+    private Integer type;
+
+    /**
+     * 目标id
+     */
+    private String targetId;
+
+    /**
+     * 电子手册
+     */
+    private String manualId;
+
+    /**
+     * 1是 0否
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetWechatUser.java

 package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 正在现场服务号关注事件储存用户信息表
@@ -18,10 +19,9 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetWechatUser implements Serializable, Cloneable {
+public class SweetWechatUser implements Serializable {
 
-
-    private static final long serialVersionUID = 2488082702147622591L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
@@ -31,6 +31,16 @@ public class SweetWechatUser implements Serializable, Cloneable {
      */
     private String userId;
 
+    /**
+     * adam_user_id
+     */
+    private String adamUserId;
+
+    /**
+     * adam_phone
+     */
+    private String adamPhone;
+
     /**
      * openId
      */

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetAnswerMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetAnswerMapper.java

@@ -3,7 +3,6 @@ package com.liquidnet.service.sweet.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.sweet.entity.SweetAnswer;
 import com.liquidnet.service.sweet.vo.SweetUserTempVo;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetArtistsMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetArtistsMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetArtists;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetArtists;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetCityVoteMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetCityVoteMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetCityVote;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetCityVote;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetCityVoteStatMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetCityVoteStatMapper.java

 package com.liquidnet.service.sweet.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.sweet.dto.SweetCityVoteStatDto;
 import com.liquidnet.service.sweet.entity.SweetCityVoteStat;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualArtistsMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualArtistsMapper.java

 package com.liquidnet.service.sweet.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
 import com.liquidnet.service.sweet.dto.SweetManualArtistStageListDto;
-import com.liquidnet.service.sweet.dto.SweetManualDto;
 import com.liquidnet.service.sweet.entity.SweetManualArtists;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
 import java.util.Map;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualArtistsMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualArtistsMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistStageListDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistStageListMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualArtistsMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 电子宣传手册艺人表 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetManualArtistsMdskMapper extends BaseMapper<SweetManualArtistsMdsk> {
-
-    List<SweetManualArtistListMDSKDto> getManualList(Map<String, Object> map);
-
-    SweetManualArtistListMDSKDto getManualDetails(Map<String, Object> map);
-
-    List<SweetManualArtistStageListMDSKDto> getStageNameList(Map<String, Object> map);
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto;
+import com.liquidnet.service.sweet.dto.SweetManualArtistStageListMDSKDto;
+import com.liquidnet.service.sweet.entity.SweetManualArtistsMdsk;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 电子宣传手册艺人表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetManualArtistsMdskMapper extends BaseMapper<SweetManualArtistsMdsk> {
+
+    List<SweetManualArtistListMDSKDto> getManualList(Map<String, Object> map);
+
+    SweetManualArtistListMDSKDto getManualDetails(Map<String, Object> map);
+
+    List<SweetManualArtistStageListMDSKDto> getStageNameList(Map<String, Object> map);
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualMapper.java

 package com.liquidnet.service.sweet.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
 import com.liquidnet.service.sweet.dto.SweetManualDto;
 import com.liquidnet.service.sweet.entity.SweetManual;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
 import java.util.Map;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
-import com.liquidnet.service.sweet.dto.SweetManualAppletMDSKDto;
-import com.liquidnet.service.sweet.dto.SweetManualDto;
-import com.liquidnet.service.sweet.dto.SweetManualMDSKDto;
-import com.liquidnet.service.sweet.entity.SweetManualMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 电子宣传手册表 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetManualMdskMapper extends BaseMapper<SweetManualMdsk> {
-
-    List<SweetManualMDSKDto> getManualList(Map<String,Object> map);
-
-    SweetManualMDSKDto getManualDetails(Map<String,Object> map);
-
-    List<SweetManualAppletMDSKDto> getManualAppletDto();
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.dto.SweetManualAppletMDSKDto;
+import com.liquidnet.service.sweet.dto.SweetManualMDSKDto;
+import com.liquidnet.service.sweet.entity.SweetManualMdsk;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 电子宣传手册表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetManualMdskMapper extends BaseMapper<SweetManualMdsk> {
+
+    List<SweetManualMDSKDto> getManualList(Map<String,Object> map);
+
+    SweetManualMDSKDto getManualDetails(Map<String,Object> map);
+
+    List<SweetManualAppletMDSKDto> getManualAppletDto();
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualNotifyMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualNotifyMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetManualNotify;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetManualNotify;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualNotifyMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualNotifyMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 电子宣传手册通知表 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetManualNotifyMdskMapper extends BaseMapper<SweetManualNotifyMdsk> {
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetManualNotifyMdsk;
+
+/**
+ * <p>
+ * 电子宣传手册通知表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetManualNotifyMdskMapper extends BaseMapper<SweetManualNotifyMdsk> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualShopMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualShopMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetManualShop;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualShopMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualShopMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 电子宣传手册商铺表 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetManualShopMdskMapper extends BaseMapper<SweetManualShopMdsk> {
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
+
+/**
+ * <p>
+ * 电子宣传手册商铺表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetManualShopMdskMapper extends BaseMapper<SweetManualShopMdsk> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualSortMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualSortMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetManualSort;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetManualSort;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualSortMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetManualSortMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 电子宣传手册显示内容表 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetManualSortMdskMapper extends BaseMapper<SweetManualSortMdsk> {
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetManualSortMdsk;
+
+/**
+ * <p>
+ * 电子宣传手册显示内容表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetManualSortMdskMapper extends BaseMapper<SweetManualSortMdsk> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetRichtextMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetRichtextMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetRichtext;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetRichtext;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetRichtextMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetRichtextMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 电子宣传手册富文本表 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetRichtextMdskMapper extends BaseMapper<SweetRichtextMdsk> {
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetRichtextMdsk;
+
+/**
+ * <p>
+ * 电子宣传手册富文本表 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetRichtextMdskMapper extends BaseMapper<SweetRichtextMdsk> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetStageMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetStageMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetStage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetStage;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetUserRelationMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetUserRelationMapper.java

 package com.liquidnet.service.sweet.mapper;
 
-import com.liquidnet.service.sweet.entity.SweetUserRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetUserRelation;
 
 /**
  * <p>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/mapper/SweetUserRelationMdskMapper.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetUserRelationMdskMapper.java

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetUserRelationMdsk;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 用户 收藏/喜欢等状态 Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-08-09
- */
-public interface SweetUserRelationMdskMapper extends BaseMapper<SweetUserRelationMdsk> {
-
-}
+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.entity.SweetUserRelationMdsk;
+
+/**
+ * <p>
+ * 用户 收藏/喜欢等状态 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetUserRelationMdskMapper extends BaseMapper<SweetUserRelationMdsk> {
+
+}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetUserTempVo.java → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/vo/SweetUserTempVo.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 
 @Data
 public class SweetUserTempVo implements Serializable, Cloneable {
+    private static final long serialVersionUID = -7304187120444951561L;
     /**
      * 第几个奖
      */

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMdskMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetManualArtistsMdskMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualArtistsMdskMapper">
-
-    <resultMap id="getManualListResult" type="com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto">
-        <result column="manual_relation_id" property="manualRelationId"/>
-        <result column="artists_id" property="artistId"/>
-        <result column="name" property="name"/>
-        <result column="pinyin" property="pinyin"/>
-        <result column="describes" property="describes"/>
-        <result column="pic_url" property="picUrl"/>
-        <result column="stage_id" property="stageId"/>
-        <result column="title" property="title"/>
-        <result column="performance_start" property="performanceStart"/>
-        <result column="performance_end" property="performanceEnd"/>
-        <result column="signature_start" property="signatureStart"/>
-        <result column="signature_end" property="signatureEnd"/>
-    </resultMap>
-
-    <resultMap id="getStageNameListResult" type="com.liquidnet.service.sweet.dto.SweetManualArtistStageListMDSKDto">
-        <result column="title" property="title"/>
-    </resultMap>
-
-    <select id="getManualList" parameterType="java.util.Map" resultMap="getManualListResult">
-        select manual_relation_id,
-        sa.`artists_id`,
-        sa.`name`,
-        sa.pinyin,
-        sa.describes,
-        sa.pic_url,
-        ss.stage_id,
-        ss.title,
-        performance_start,
-        performance_end,
-        signature_start,
-        signature_end
-        from sweet_manual_artists_mdsk as sma
-        left join sweet_artists as sa on sa.artists_id = sma.artists_id
-        left join sweet_stage as ss on ss.stage_id = sma.stage_id
-        <where>
-            sma.status = 1 and manual_id = #{manualId}
-        </where>
-        ORDER BY sma.updated_at DESC
-    </select>
-
-    <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">
-        select manual_relation_id,
-               sa.`name`,
-               sa.`artists_id`,
-               ss.title,
-               ss.stage_id,
-               performance_start,
-               performance_end,
-               signature_start,
-               signature_end
-        from sweet_manual_artists_mdsk as sma
-                 left join sweet_artists as sa on sa.artists_id = sma.artists_id
-                 left join sweet_stage as ss on ss.stage_id = sma.stage_id
-        where manual_relation_id = #{manualRelationId}
-    </select>
-
-    <select id="getStageNameList" parameterType="java.util.Map" resultMap="getStageNameListResult">
-        select ss.title
-        from sweet_manual_artists_mdsk as sma
-                 left join sweet_artists as sa on sa.artists_id = sma.artists_id
-                 left join sweet_stage as ss on ss.stage_id = sma.stage_id
-        where sma.status = 1
-          and manual_id = #{manualId}
-        group by ss.title;
-
-    </select>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualArtistsMdskMapper">
+
+    <resultMap id="getManualListResult" type="com.liquidnet.service.sweet.dto.SweetManualArtistListMDSKDto">
+        <result column="manual_relation_id" property="manualRelationId"/>
+        <result column="artists_id" property="artistId"/>
+        <result column="name" property="name"/>
+        <result column="pinyin" property="pinyin"/>
+        <result column="describes" property="describes"/>
+        <result column="pic_url" property="picUrl"/>
+        <result column="stage_id" property="stageId"/>
+        <result column="title" property="title"/>
+        <result column="performance_start" property="performanceStart"/>
+        <result column="performance_end" property="performanceEnd"/>
+        <result column="signature_start" property="signatureStart"/>
+        <result column="signature_end" property="signatureEnd"/>
+    </resultMap>
+
+    <resultMap id="getStageNameListResult" type="com.liquidnet.service.sweet.dto.SweetManualArtistStageListMDSKDto">
+        <result column="title" property="title"/>
+    </resultMap>
+
+    <select id="getManualList" parameterType="java.util.Map" resultMap="getManualListResult">
+        select manual_relation_id,
+        sa.`artists_id`,
+        sa.`name`,
+        sa.pinyin,
+        sa.describes,
+        sa.pic_url,
+        ss.stage_id,
+        ss.title,
+        performance_start,
+        performance_end,
+        signature_start,
+        signature_end
+        from sweet_manual_artists_mdsk as sma
+        left join sweet_artists as sa on sa.artists_id = sma.artists_id
+        left join sweet_stage as ss on ss.stage_id = sma.stage_id
+        <where>
+            sma.status = 1 and manual_id = #{manualId}
+        </where>
+        ORDER BY sma.updated_at DESC
+    </select>
+
+    <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">
+        select manual_relation_id,
+               sa.`name`,
+               sa.`artists_id`,
+               ss.title,
+               ss.stage_id,
+               performance_start,
+               performance_end,
+               signature_start,
+               signature_end
+        from sweet_manual_artists_mdsk as sma
+                 left join sweet_artists as sa on sa.artists_id = sma.artists_id
+                 left join sweet_stage as ss on ss.stage_id = sma.stage_id
+        where manual_relation_id = #{manualRelationId}
+    </select>
+
+    <select id="getStageNameList" parameterType="java.util.Map" resultMap="getStageNameListResult">
+        select ss.title
+        from sweet_manual_artists_mdsk as sma
+                 left join sweet_artists as sa on sa.artists_id = sma.artists_id
+                 left join sweet_stage as ss on ss.stage_id = sma.stage_id
+        where sma.status = 1
+          and manual_id = #{manualId}
+        group by ss.title;
+
+    </select>
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualNotifyMdskMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetManualNotifyMdskMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualNotifyMdskMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualNotifyMdskMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualShopMdskMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetManualShopMdskMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualShopMdskMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualShopMdskMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualSortMdskMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetManualSortMdskMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualSortMdskMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetManualSortMdskMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetRichtextMdskMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetRichtextMdskMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetRichtextMdskMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetRichtextMdskMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetUserRelationMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetUserRelationMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetUserRelationMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetUserRelationMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetUserRelationMdskMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetUserRelationMdskMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetUserRelationMdskMapper">
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetUserRelationMdskMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

-package com.liquidnet.service.sweet.constant;
-
-import com.google.common.collect.FluentIterable;
-
-/**
- *
- */
-public class SweetConstant {
-
-    public final static String REDIS_KEY_SWEET_MANUAL_PUSH_LIST = "sweet:manual:pushList";
-    public final static String REDIS_KEY_SWEET_MANUAL_TIME_LIST = "sweet:manual:timeList:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_NOTIFY_LIST = "sweet:manual:notify:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_RICH_TEXT = "sweet:manual:richText:manual:";
-    public final static String REDIS_KEY_SWEET_MANUAL_SORT = "sweet:manual:sort:manual:";
-    public final static String REDIS_KEY_SWEET_ARTISTS_RELATION = "sweet:artists:relation:uid:";
-    public final static String REDIS_KEY_SWEET_ARTISTS_DETAILS = "sweet:artists:details:";
-    public final static String REDIS_KEY_SWEET_SHOP = "sweet:artists:shop:manual:";
-
-    public final static String REDIS_KEY_SWEET_LUCK_DRAW = "sweet:luckDraw:mobile:";
-    public final static String REDIS_KEY_SWEET_LUCK_DRAW_RESULT = "sweet:luckDraw:num:";
-    public final static String REDIS_KEY_SWEET_LUCK_DRAW_SURPLUS = "sweet:luckDraw:num:";//中奖库存
-    public final static String REDIS_KEY_SWEET_LUCK_DRAW_ALL = "sweet:luckDraw:num:";//中奖总量
-    public final static String REDIS_KEY_SWEET_LUCK_DRAW_PRESENT_MOBILE = "sweet:luckDraw:present:mobile:";//中奖库存
-
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO="sweet:wechatUser:zhengzai:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY="sweet:wechatUser:modernsky:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID="sweet:wechatUser:zhengzai:openId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_MODERNSKY="sweet:wechatUser:modernsky:openId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE="sweet:wechatUser:zhengzai:phone:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY="sweet:wechatUser:modernsky:phone:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID="sweet:wechatUser:zhengzai:uid:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY="sweet:wechatUser:modernsky:uid:";
-
-    public final static String REDIS_KEY_SWEET_ANSWER_PHONE="sweet:answer:phone:";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_LIST=":StatList";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_CITY_CODE=":cityCode:";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE="sweet:cityVote";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_USER=":user:";
-    public final static String REDIS_KEY_SWEET_CITY_VOTE_STAT_UPDATE_TIME=":updateTime";
-
-//    public enum ManualPosition {
-//        artist("艺人","artist"),
-//        signingTime("签售时间","signingTime"),
-//        foodAndAmusement("吃喝玩乐","foodAndAmusement"),
-//        siteMap("现场地图","siteMap"),
-//        howToReach("如何到达","howToReach"),
-//        relatedProduct ("官方售卖","relatedProduct"),
-//        officialSupport("官方支持","officialSupport"),
-//        audienceNotice("观众须知","audienceNotice"),
-//        preventionGuidelines("防疫指南","preventionGuidelines"),
-//        notice("通知","notice"),
-//        strategy("观演攻略","strategy");
-//
-//        private String message;
-//        private String code;
-//
-//        private ManualPosition(String message, String code) {
-//            this.message = message;
-//            this.code = code;
-//        }
-//
-//        public void setCode(String code) {
-//            this.code = code;
-//        }
-//
-//        public String getCode() {
-//            return code;
-//        }
-//
-//        public void setMessage(String message) {
-//            this.message = message;
-//        }
-//
-//        public String getMessage() {
-//            return message;
-//        }
-//
-//        public static String getMessage(String code) {
-//            for (ManualPosition c : ManualPosition.values()) {
-//                if (c.getCode().equalsIgnoreCase(code)) {
-//                    return c.message;
-//                }
-//            }
-//            return null;
-//        }
-//    }
-
-
-    public final static String REDIS_KEY_SWEET_MDSK_MANUAL_PUSH_LIST = "sweet:mdsk:manual:pushList";
-    public final static String REDIS_KEY_SWEET_MDSK_MANUAL_TIME_LIST = "sweet:mdsk:manual:timeList:manual:";
-    public final static String REDIS_KEY_SWEET_MDSK_MANUAL_NOTIFY_LIST = "sweet:mdsk:manual:notify:manual:";
-    public final static String REDIS_KEY_SWEET_MDSK_MANUAL_RICH_TEXT = "sweet:mdsk:manual:richText:manual:";
-    public final static String REDIS_KEY_SWEET_MDSK_MANUAL_SORT = "sweet:mdsk:manual:sort:manual:";
-    public final static String REDIS_KEY_SWEET_MDSK_ARTISTS_RELATION = "sweet:mdsk:artists:relation:uid:";
-    public final static String REDIS_KEY_SWEET_MDSK_ARTISTS_DETAILS = "sweet:mdsk:artists:details:";
-    public final static String REDIS_KEY_SWEET_MDSK_SHOP = "sweet:mdsk:artists:shop:manual:";
-
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_LIST = "sweet:integralActivity:list";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_INFO = "sweet:integralActivity:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_ALL_LIST = "sweet:integralActivity:Draw:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER = "sweet:integralActivity:Draw:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER = "sweet:integralActivity:DrawIn:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM = "sweet:integralActivity:prizeNum:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_WINNERS_NUM = "sweet:integralActivity:prizeWinnersNum:activityId:";
-    public static final String REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_INFO = "sweet:integralActivity:DrawInfo:drawId:";
-}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetDataController.java

@@ -4,18 +4,12 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.mapper.SweetAnswerMapper;
-import com.liquidnet.service.sweet.service.impl.SweetWechatLoginServiceImpl;
-import com.liquidnet.service.sweet.vo.SweetUserTempVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Api(tags = "数据迁移")
 @RestController
 @RequestMapping("/sweetData")

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetAppletUser.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 小程序登录记录用户解密后信息表
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-09-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetAppletUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * user_id
-     */
-    private String userId;
-
-    /**
-     * openId
-     */
-    @TableField("openId")
-    private String openId;
-
-    /**
-     * unionId
-     */
-    @TableField("unionId")
-    private String unionId;
-
-    /**
-     * 手机号
-     */
-    @TableField("getPhoneNumber")
-    private String getPhoneNumber;
-
-    /**
-     * 手机号
-     */
-    @TableField("getPurePhoneNumber")
-    private String getPurePhoneNumber;
-
-    /**
-     * 地区码
-     */
-    @TableField("getCountryCode")
-    private String getCountryCode;
-
-    /**
-     * 1草莓 2五百里 3mdsk 4正在
-     */
-    private Integer type;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-
-}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetWechatUser.java

-package com.liquidnet.service.sweet.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 正在现场服务号关注事件储存用户信息表
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-08-03
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetWechatUser implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * user_id
-     */
-    private String userId;
-
-    /**
-     * adam_user_id
-     */
-    private String adamUserId;
-
-    /**
-     * adam_phone
-     */
-    private String adamPhone;
-
-    /**
-     * openId
-     */
-    @TableField("openId")
-    private String openId;
-
-    /**
-     * unionId
-     */
-    @TableField("unionId")
-    private String unionId;
-
-    /**
-     * 昵称
-     */
-    private String nickname;
-
-    /**
-     * 性别
-     */
-    @TableField("sexDesc")
-    private String sexDesc;
-
-    /**
-     * 性别 男1
-     */
-    private Integer sex;
-
-    /**
-     * 头像
-     */
-    @TableField("headImgUrl")
-    private String headImgUrl;
-
-    /**
-     * zh_CN
-     */
-    private String language;
-
-    /**
-     * 国家
-     */
-    private String country;
-
-    /**
-     * 省
-     */
-    private String province;
-
-    /**
-     * 市
-     */
-    private String city;
-
-    /**
-     * 关注时间
-     */
-    @TableField("subscribeTime")
-    private LocalDateTime subscribeTime;
-
-    /**
-     * ADD_SCENE_SEARCH 关注方式
-     */
-    @TableField("subscribeScene")
-    private String subscribeScene;
-
-    /**
-     * 是否取消关注
-     */
-    private Integer isCancel;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-    private static final SweetWechatUser obj = new SweetWechatUser();
-    public static SweetWechatUser getNew() {
-        try {
-            return (SweetWechatUser) obj.clone();
-        } catch (CloneNotSupportedException e) {
-            return new SweetWechatUser();
-        }
-    }
-
-
-}

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetWechatUserMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.sweet.mapper.SweetWechatUserMapper">
-
-</mapper>