Merge branch 'dev_stone' into dev_20111115

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

@@ -53,8 +53,7 @@ public class SweetConstant {
     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_WECHAT_USERS = "sweet:wechat:users:unionId:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USERS = "sweet:user:service:unionId:";
     public final static String REDIS_KEY_SWEET_WECHAT_USERS_TYPE = ":type:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USERS_RELATION_PHONE = "sweet:wechat:usersRelation:mobile:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USERS_RELATION_UNIONID = "sweet:wechat:usersRelation:unionId:";
+    public final static String REDIS_KEY_SWEET_APPLET_USERS_PHONE = "sweet:user:applet:mobile:";
 }

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetWechatUserService.java → liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetAppletUsersService.java

 package com.liquidnet.service.sweet.service;
 
+import com.liquidnet.service.sweet.entity.SweetAppletUsers;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
 
 /**
  * <p>
- * 正在现场服务号关注事件储存用户信息表 服务类
+ * 小程序登录记录用户解密后信息表 服务类
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-08-03
+ * @since 2021-11-05
  */
-public interface ISweetWechatUserService extends IService<SweetWechatUser> {
+public interface ISweetAppletUsersService extends IService<SweetAppletUsers> {
 
 }

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

-package com.liquidnet.service.sweet.service;
-
-import com.liquidnet.service.sweet.entity.SweetWechatUsersRelation;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 微信用户信息关联表 服务类
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-11-04
- */
-public interface ISweetWechatUsersRelationService extends IService<SweetWechatUsersRelation> {
-
-}

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 微信用户信息表包含小程序公众号 服务类
+ * 正在现场服务号关注事件储存用户信息表 服务类
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-11-04
+ * @since 2021-11-05
  */
 public interface ISweetWechatUsersService extends IService<SweetWechatUsers> {
 

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

@@ -6,14 +6,24 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 @Data
-public class SweetWechatUsersRelationVo implements Serializable, Cloneable {
+public class SweetAppletUsersVo implements Serializable, Cloneable {
 
-    private static final long serialVersionUID = -7943731833999082046L;
+    private static final long serialVersionUID = 5817630726751578436L;
 
     /**
-     * wechat_relation_id
+     * applet_user_id
      */
-    private String wechatRelationId;
+    private String appletUserId;
+
+    /**
+     * user_id
+     */
+    private String userId;
+
+    /**
+     * openId
+     */
+    private String openId;
 
     /**
      * unionId
@@ -21,14 +31,24 @@ public class SweetWechatUsersRelationVo implements Serializable, Cloneable {
     private String unionId;
 
     /**
-     * adam用户id
+     * 手机号
      */
-    private String userId;
+    private String phoneNumber;
+
+    /**
+     * 手机号
+     */
+    private String purePhoneNumber;
+
+    /**
+     * 地区码
+     */
+    private String countryCode;
 
     /**
-     * adam用户手机号
+     * 1草莓 2五百里 3mdsk 4正在
      */
-    private String userPhone;
+    private Integer type;
 
     /**
      * 创建时间
@@ -40,12 +60,12 @@ public class SweetWechatUsersRelationVo implements Serializable, Cloneable {
      */
     private LocalDateTime updatedAt;
 
-    private static final SweetWechatUsersRelationVo obj = new SweetWechatUsersRelationVo();
-    public static SweetWechatUsersRelationVo getNew() {
+    private static final SweetAppletUsersVo obj = new SweetAppletUsersVo();
+    public static SweetAppletUsersVo getNew() {
         try {
-            return (SweetWechatUsersRelationVo) obj.clone();
+            return (SweetAppletUsersVo) obj.clone();
         } catch (CloneNotSupportedException e) {
-            return new SweetWechatUsersRelationVo();
+            return new SweetAppletUsersVo();
         }
     }
 

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

@@ -11,39 +11,24 @@ public class SweetWechatUsersVo implements Serializable, Cloneable {
     private static final long serialVersionUID = -8639044068603169141L;
 
     /**
-     * wechat_id
+     * wechat_user_id
      */
-    private String wechatId;
+    private String wechatUserId;
 
     /**
-     * openId
-     */
-    private String openId;
-
-    /**
-     * unionId
-     */
-    private String unionId;
-
-    /**
-     * 服务类型 1正在 2摩登 21草莓 22五百里 23mdsk 24正在
+     * 服务类型 1正在 2摩登
      */
     private Integer type;
 
     /**
-     * 小程序解密手机号
-     */
-    private String phoneNumber;
-
-    /**
-     * 小程序解密手机号
+     * openId
      */
-    private String purePhoneNumber;
+    private String openId;
 
     /**
-     * 小程序解密地区码
+     * unionId
      */
-    private String countryCode;
+    private String unionId;
 
     /**
      * 昵称

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

 package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 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>
  * 小程序登录记录用户解密后信息表
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-09-22
+ * @since 2021-11-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetAppletUser implements Serializable {
+public class SweetAppletUsers implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
 
+    /**
+     * applet_user_id
+     */
+    private String appletUserId;
+
     /**
      * user_id
      */
@@ -34,32 +37,27 @@ public class SweetAppletUser implements Serializable {
     /**
      * openId
      */
-    @TableField("openId")
     private String openId;
 
     /**
      * unionId
      */
-    @TableField("unionId")
     private String unionId;
 
     /**
      * 手机号
      */
-    @TableField("getPhoneNumber")
-    private String getPhoneNumber;
+    private String phoneNumber;
 
     /**
      * 手机号
      */
-    @TableField("getPurePhoneNumber")
-    private String getPurePhoneNumber;
+    private String purePhoneNumber;
 
     /**
      * 地区码
      */
-    @TableField("getCountryCode")
-    private String getCountryCode;
+    private String countryCode;
 
     /**
      * 1草莓 2五百里 3mdsk 4正在

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

@@ -9,55 +9,40 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 微信用户信息表包含小程序公众号
+ * 正在现场服务号关注事件储存用户信息表
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-11-04
+ * @since 2021-11-05
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 public class SweetWechatUsers implements Serializable {
 
-    private static final long serialVersionUID = 4529970101866070527L;
+    private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Long mid;
 
     /**
-     * wechat_id
+     * wechat_user_id
      */
-    private String wechatId;
+    private String wechatUserId;
 
     /**
-     * openId
-     */
-    private String openId;
-
-    /**
-     * unionId
-     */
-    private String unionId;
-
-    /**
-     * 服务类型 1正在 2摩登 21草莓 22五百里 23mdsk 24正在
+     * 服务类型 1正在 2摩登
      */
     private Integer type;
 
     /**
-     * 小程序解密手机号
-     */
-    private String phoneNumber;
-
-    /**
-     * 小程序解密手机号
+     * openId
      */
-    private String purePhoneNumber;
+    private String openId;
 
     /**
-     * 小程序解密地区码
+     * unionId
      */
-    private String countryCode;
+    private String unionId;
 
     /**
      * 昵称

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetWechatUsersRelation.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 jiangxiulong
- * @since 2021-11-04
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class SweetWechatUsersRelation implements Serializable {
-
-    private static final long serialVersionUID = 1805653079540343937L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Long mid;
-
-    /**
-     * wechat_relation_id
-     */
-    private String wechatRelationId;
-
-    /**
-     * unionId
-     */
-    private String unionId;
-
-    /**
-     * adam用户id
-     */
-    private String userId;
-
-    /**
-     * adam用户手机号
-     */
-    private String userPhone;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createdAt;
-
-    /**
-     * 更新时间
-     */
-    private LocalDateTime updatedAt;
-
-
-}

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

 package com.liquidnet.service.sweet.mapper;
 
+import com.liquidnet.service.sweet.entity.SweetAppletUsers;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.sweet.entity.SweetAppletUser;
 
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.liquidnet.service.sweet.entity.SweetAppletUser;
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-09-22
+ * @since 2021-11-05
  */
-public interface SweetAppletUserMapper extends BaseMapper<SweetAppletUser> {
+public interface SweetAppletUsersMapper extends BaseMapper<SweetAppletUsers> {
 
 }

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 微信用户信息表包含小程序公众号 Mapper 接口
+ * 正在现场服务号关注事件储存用户信息表 Mapper 接口
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-11-04
+ * @since 2021-11-05
  */
 public interface SweetWechatUsersMapper extends BaseMapper<SweetWechatUsers> {
 

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

-package com.liquidnet.service.sweet.mapper;
-
-import com.liquidnet.service.sweet.entity.SweetWechatUsersRelation;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 微信用户信息关联表 Mapper 接口
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-11-04
- */
-public interface SweetWechatUsersRelationMapper extends BaseMapper<SweetWechatUsersRelation> {
-
-}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetWechatUsersRelationMapper.xml → liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetAppletUsersMapper.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.SweetWechatUsersRelationMapper">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper">
 
 </mapper>

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/service/impl/SweetWechatTemplateMsgServiceImpl.java

@@ -6,9 +6,10 @@ import com.liquidnet.service.consumer.sweet.config.WechatMaConfigure;
 import com.liquidnet.service.consumer.sweet.config.WechatMpConfigure;
 import com.liquidnet.service.consumer.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.dto.param.SweetOpenSendMsgParam;
-import com.liquidnet.service.sweet.entity.SweetAppletUser;
+import com.liquidnet.service.sweet.entity.SweetAppletUsers;
 import com.liquidnet.service.sweet.entity.SweetWechatUser;
-import com.liquidnet.service.sweet.mapper.SweetAppletUserMapper;
+import com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper;
+import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -40,7 +41,7 @@ public class SweetWechatTemplateMsgServiceImpl {
     WechatMaConfigure wechatMaConfigure;
 
     @Autowired
-    private SweetAppletUserMapper sweetAppletUserMapper;
+    private SweetAppletUsersMapper sweetAppletUserMapper;
 
     @Autowired
     private RedisDataUtils redisDataUtils;
@@ -101,18 +102,18 @@ public class SweetWechatTemplateMsgServiceImpl {
         return templateMessage;
     }
     private String getOpenId(String phone, Integer sendTargetType) { // sendTargetType 将来如果加入其他服务号用获取不同openId
-        List<SweetAppletUser> sweetAppletUsers = sweetAppletUserMapper.selectList(Wrappers.lambdaQuery(SweetAppletUser.class).eq(SweetAppletUser::getGetPurePhoneNumber, phone));
+        List<SweetAppletUsers> sweetAppletUsers = sweetAppletUserMapper.selectList(Wrappers.lambdaQuery(SweetAppletUsers.class).eq(SweetAppletUsers::getPurePhoneNumber, phone));
         if (CollectionUtils.isEmpty(sweetAppletUsers)) {
             log.info("getOpenId没有此applet用户：[phone=[{}]", phone);
             return "";
         } else {
-            SweetAppletUser sweetAppletUser = sweetAppletUsers.get(0);
-            SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(sweetAppletUser.getUnionId());
-            if (null == userInfo) {
+            SweetAppletUsers sweetAppletUser = sweetAppletUsers.get(0);
+            SweetWechatUsersVo sweetWechatUsers = redisDataUtils.getSweetWechatUsers(sweetAppletUser.getUnionId(), 1);
+            if (null == sweetWechatUsers) {
                 log.info("getOpenId没有此WechatUser用户：[phone={},unionId={}]", phone, sweetAppletUser.getUnionId());
                 return "";
             } else {
-                return userInfo.getOpenId();
+                return sweetWechatUsers.getOpenId();
             }
         }
     }

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/utils/RedisDataUtils.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.consumer.sweet.utils;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.entity.SweetWechatUser;
+import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -14,12 +15,16 @@ public class RedisDataUtils {
     @Autowired
     private RedisUtil redisUtil;
 
-    public SweetWechatUser getSweetWechatUser(String unionid) {
-        if (unionid.isEmpty()) {
+    public SweetWechatUsersVo getSweetWechatUsers(String unionId, Integer type) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS.concat(unionId)
+                .concat(SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_TYPE).concat(String.valueOf(type));
+        Object obj = redisUtil.get(redisKey);
+        if (null == obj) {
             return null;
+        } else {
+            SweetWechatUsersVo sweetWechatUsersVo = (SweetWechatUsersVo) obj;
+            return sweetWechatUsersVo;
         }
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(unionid);
-        return (SweetWechatUser) redisUtil.get(redisKey);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql

@@ -87,53 +87,4 @@ CREATE TABLE `sweet_integral_activity_draw`
 ) ENGINE = InnoDB
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci
-  ROW_FORMAT = DYNAMIC COMMENT '积分活动抽奖记录表';
-
+  ROW_FORMAT = DYNAMIC COMMENT '积分活动抽奖记录表';
\ No newline at end of file
--- 微信用户信息表包含小程序公众号
-drop TABLE if exists `sweet_wechat_users`;
-CREATE TABLE `sweet_wechat_users`
-(
-    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
-    `wechat_id`         varchar(200)    NOT NULL DEFAULT '' COMMENT 'wechat_id',
-    `open_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
-    `union_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
-    `type`              tinyint         NOT NULL DEFAULT 0 COMMENT '服务类型 1正在 2摩登 21草莓 22五百里 23mdsk 24正在',
-    `phone_number`      varchar(200)    NOT NULL DEFAULT '' COMMENT '小程序解密手机号',
-    `pure_phone_number` varchar(200)    NOT NULL DEFAULT '' COMMENT '小程序解密手机号',
-    `country_code`      varchar(200)    NOT NULL DEFAULT '' COMMENT '小程序解密地区码',
-    `nickname`          varchar(200)    NOT NULL DEFAULT '' COMMENT '昵称',
-    `sex_desc`          varchar(200)    NOT NULL DEFAULT '' COMMENT '性别',
-    `sex`               tinyint         NOT NULL DEFAULT 0 COMMENT '性别 男1',
-    `head_img_url`      varchar(200)    NOT NULL DEFAULT '' COMMENT '头像',
-    `language`          varchar(200)    NOT NULL DEFAULT '' COMMENT 'zh_CN',
-    `country`           varchar(200)    NOT NULL DEFAULT '' COMMENT '国家',
-    `province`          varchar(200)    NOT NULL DEFAULT '' COMMENT '省',
-    `city`              varchar(200)    NOT NULL DEFAULT '' COMMENT '市',
-    `subscribe_time`    datetime        NULL     DEFAULT null COMMENT '关注时间',
-    `subscribe_scene`   varchar(200)    NOT NULL DEFAULT '' COMMENT 'ADD_SCENE_SEARCH 关注方式',
-    `created_at`        datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`        datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
-    PRIMARY KEY (`mid`),
-    KEY `idx_sweet_wechat_id` (`wechat_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET utf8mb4
-  COLLATE utf8mb4_unicode_ci
-  ROW_FORMAT = DYNAMIC COMMENT '微信用户信息表包含小程序公众号';
-
--- 微信用户信息关联表
-drop TABLE if exists `sweet_wechat_users_relation`;
-CREATE TABLE `sweet_wechat_users_relation`
-(
-    `mid`                bigint unsigned NOT NULL AUTO_INCREMENT,
-    `wechat_relation_id` varchar(200)    NOT NULL DEFAULT '' COMMENT 'wechat_relation_id',
-    `union_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
-    `user_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT 'adam用户id',
-    `user_phone`         varchar(200)    NOT NULL DEFAULT '' COMMENT 'adam用户手机号',
-    `created_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
-    PRIMARY KEY (`mid`),
-    KEY `idx_sweet_wechat_relation_id` (`wechat_relation_id`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET utf8mb4
-  COLLATE utf8mb4_unicode_ci
-  ROW_FORMAT = DYNAMIC COMMENT '微信用户信息关联表';
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -142,7 +142,7 @@ CREATE TABLE `sweet_manual_notify`
 (
     `mid`              bigint unsigned NOT NULL AUTO_INCREMENT,
     `manual_notify_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_notify_id',
-    `manual_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `manual_id`        varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
     `title`            varchar(200)    NOT NULL DEFAULT '' COMMENT '标题',
     `content`          longtext        NULL COMMENT '内容',
     `status`           tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
@@ -162,18 +162,18 @@ CREATE TABLE `sweet_manual_notify`
 drop TABLE if exists `sweet_manual_shop`;
 CREATE TABLE `sweet_manual_shop`
 (
-    `mid`                   bigint unsigned NOT NULL AUTO_INCREMENT,
-    `manual_shop_id`        varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_shop_id',
-    `manual_id`             varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
-    `title`                 varchar(200)    NOT NULL DEFAULT '' COMMENT '商家名称',
-    `pic_url`               varchar(200)    NOT NULL DEFAULT '' COMMENT '商家图片',
-    `describes`              longtext        NULL COMMENT '商家介绍',
-    `type`                  tinyint         NOT NULL DEFAULT 1 COMMENT '1吃喝 2玩乐',
-    `is_recommend`          tinyint         NOT NULL DEFAULT 1 COMMENT '0不推荐 1推荐',
-    `sort`                  tinyint         NOT NULL DEFAULT 0 COMMENT '排序字段 数字越大越靠前',
-    `status`                tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
-    `created_at`            datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`            datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`            bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_shop_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_shop_id',
+    `manual_id`      varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `title`          varchar(200)    NOT NULL DEFAULT '' COMMENT '商家名称',
+    `pic_url`        varchar(200)    NOT NULL DEFAULT '' COMMENT '商家图片',
+    `describes`      longtext        NULL COMMENT '商家介绍',
+    `type`           tinyint         NOT NULL DEFAULT 1 COMMENT '1吃喝 2玩乐',
+    `is_recommend`   tinyint         NOT NULL DEFAULT 1 COMMENT '0不推荐 1推荐',
+    `sort`           tinyint         NOT NULL DEFAULT 0 COMMENT '排序字段 数字越大越靠前',
+    `status`         tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
     KEY `manual_shop_index` (`manual_shop_id`),
     KEY `manual_id_index` (`manual_id`),
@@ -187,14 +187,14 @@ CREATE TABLE `sweet_manual_shop`
 drop TABLE if exists `sweet_user_relation`;
 CREATE TABLE `sweet_user_relation`
 (
-    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
-    `user_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT '用户id',
-    `type`             tinyint    NOT NULL DEFAULT 0 COMMENT '类型 1喜欢艺人  2签售艺人',
-    `target_id`         varchar(200)    NOT NULL DEFAULT '' COMMENT '目标id',
-    `manual_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT '电子手册',
-    `status`            tinyint    NOT NULL DEFAULT 0 COMMENT '1是 0否',
-    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`        bigint unsigned NOT NULL AUTO_INCREMENT,
+    `user_id`    varchar(200)    NOT NULL DEFAULT '' COMMENT '用户id',
+    `type`       tinyint         NOT NULL DEFAULT 0 COMMENT '类型 1喜欢艺人  2签售艺人',
+    `target_id`  varchar(200)    NOT NULL DEFAULT '' COMMENT '目标id',
+    `manual_id`  varchar(200)    NOT NULL DEFAULT '' COMMENT '电子手册',
+    `status`     tinyint         NOT NULL DEFAULT 0 COMMENT '1是 0否',
+    `created_at` datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at` datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
     KEY `sweet_wechat_user_user_id` (`user_id`)
 ) ENGINE = InnoDB
@@ -303,7 +303,7 @@ CREATE TABLE `sweet_manual_notify_mdsk`
 (
     `mid`              bigint unsigned NOT NULL AUTO_INCREMENT,
     `manual_notify_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_notify_id',
-    `manual_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `manual_id`        varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
     `title`            varchar(200)    NOT NULL DEFAULT '' COMMENT '标题',
     `content`          longtext        NULL COMMENT '内容',
     `status`           tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
@@ -323,18 +323,18 @@ CREATE TABLE `sweet_manual_notify_mdsk`
 drop TABLE if exists `sweet_manual_shop_mdsk`;
 CREATE TABLE `sweet_manual_shop_mdsk`
 (
-    `mid`                   bigint unsigned NOT NULL AUTO_INCREMENT,
-    `manual_shop_id`        varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_shop_id',
-    `manual_id`             varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
-    `title`                 varchar(200)    NOT NULL DEFAULT '' COMMENT '商家名称',
-    `pic_url`               varchar(200)    NOT NULL DEFAULT '' COMMENT '商家图片',
-    `describes`              longtext        NULL COMMENT '商家介绍',
-    `type`                  tinyint         NOT NULL DEFAULT 1 COMMENT '1吃喝 2玩乐',
-    `is_recommend`          tinyint         NOT NULL DEFAULT 1 COMMENT '0不推荐 1推荐',
-    `sort`                  tinyint         NOT NULL DEFAULT 0 COMMENT '排序字段 数字越大越靠前',
-    `status`                tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
-    `created_at`            datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`            datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`            bigint unsigned NOT NULL AUTO_INCREMENT,
+    `manual_shop_id` varchar(200)    NOT NULL DEFAULT '0' COMMENT 'manual_shop_id',
+    `manual_id`      varchar(200)    NOT NULL DEFAULT '' COMMENT '电子宣传手册id',
+    `title`          varchar(200)    NOT NULL DEFAULT '' COMMENT '商家名称',
+    `pic_url`        varchar(200)    NOT NULL DEFAULT '' COMMENT '商家图片',
+    `describes`      longtext        NULL COMMENT '商家介绍',
+    `type`           tinyint         NOT NULL DEFAULT 1 COMMENT '1吃喝 2玩乐',
+    `is_recommend`   tinyint         NOT NULL DEFAULT 1 COMMENT '0不推荐 1推荐',
+    `sort`           tinyint         NOT NULL DEFAULT 0 COMMENT '排序字段 数字越大越靠前',
+    `status`         tinyint         NOT NULL DEFAULT 1 COMMENT '0关闭 1开启',
+    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
     KEY `manual_shop_index` (`manual_shop_id`),
     KEY `manual_id_index` (`manual_id`),
@@ -376,14 +376,14 @@ CREATE TABLE `sweet_wechat_user_mdsk`
 drop TABLE if exists `sweet_user_relation_mdsk`;
 CREATE TABLE `sweet_user_relation_mdsk`
 (
-    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
-    `user_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT '用户id',
-    `type`             tinyint    NOT NULL DEFAULT 0 COMMENT '类型 1喜欢艺人  2签售艺人',
-    `target_id`         varchar(200)    NOT NULL DEFAULT '' COMMENT '目标id',
-    `manual_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT '电子手册',
-    `status`            tinyint    NOT NULL DEFAULT 0 COMMENT '1是 0否',
-    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`        bigint unsigned NOT NULL AUTO_INCREMENT,
+    `user_id`    varchar(200)    NOT NULL DEFAULT '' COMMENT '用户id',
+    `type`       tinyint         NOT NULL DEFAULT 0 COMMENT '类型 1喜欢艺人  2签售艺人',
+    `target_id`  varchar(200)    NOT NULL DEFAULT '' COMMENT '目标id',
+    `manual_id`  varchar(200)    NOT NULL DEFAULT '' COMMENT '电子手册',
+    `status`     tinyint         NOT NULL DEFAULT 0 COMMENT '1是 0否',
+    `created_at` datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at` datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
     KEY `sweet_wechat_user_user_id` (`user_id`)
 ) ENGINE = InnoDB
@@ -396,15 +396,15 @@ CREATE TABLE `sweet_user_relation_mdsk`
 drop TABLE if exists `sweet_luck_draw`;
 CREATE TABLE `sweet_luck_draw`
 (
-    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
-    `mobile`           varchar(200)    NOT NULL DEFAULT '' COMMENT '用户手机号',
-     `union_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
-    `luck_draw_num`     varchar(200)    NOT NULL DEFAULT '' COMMENT '抽奖编号',
-    `status`            tinyint    NOT NULL DEFAULT 1 COMMENT '1有资格 0无资格',
-    `prize`              tinyint    NOT NULL DEFAULT -1 COMMENT '第几个奖 prize <= prize_all 则中奖 prize!=0',
-    `prize_all`              tinyint    NOT NULL DEFAULT 0 COMMENT '总共多少',
-    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`           bigint unsigned NOT NULL AUTO_INCREMENT,
+    `mobile`        varchar(200)    NOT NULL DEFAULT '' COMMENT '用户手机号',
+    `union_id`      varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
+    `luck_draw_num` varchar(200)    NOT NULL DEFAULT '' COMMENT '抽奖编号',
+    `status`        tinyint         NOT NULL DEFAULT 1 COMMENT '1有资格 0无资格',
+    `prize`         tinyint         NOT NULL DEFAULT -1 COMMENT '第几个奖 prize <= prize_all 则中奖 prize!=0',
+    `prize_all`     tinyint         NOT NULL DEFAULT 0 COMMENT '总共多少',
+    `created_at`    datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`    datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
     KEY `sweet_luck_draw_mobile` (`mobile`)
 ) ENGINE = InnoDB
@@ -413,54 +413,50 @@ CREATE TABLE `sweet_luck_draw`
   ROW_FORMAT = DYNAMIC COMMENT '抽奖表';
 
 -- 正在现场服务号关注事件储存用户信息表
-drop TABLE if exists `sweet_wechat_user`;
-CREATE TABLE `sweet_wechat_user`
+drop TABLE if exists `sweet_wechat_users`;
+CREATE TABLE `sweet_wechat_users`
 (
-    `mid`            bigint unsigned NOT NULL AUTO_INCREMENT,
-    `user_id`        varchar(200)    NOT NULL DEFAULT '' COMMENT 'user_id',
-    `openId`         varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
-    `unionId`        varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
-    `nickname`       varchar(200)    NOT NULL DEFAULT '' COMMENT '昵称',
-    `sexDesc`        varchar(200)    NOT NULL DEFAULT '' COMMENT '性别',
-    `sex`            tinyint         NOT NULL DEFAULT 0 COMMENT '性别 男1',
-    `headImgUrl`     varchar(200)    NOT NULL DEFAULT '' COMMENT '头像',
-    `language`       varchar(200)    NOT NULL DEFAULT '' COMMENT 'zh_CN',
-    `country`        varchar(200)    NOT NULL DEFAULT '' COMMENT '国家',
-    `province`       varchar(200)    NOT NULL DEFAULT '' COMMENT '省',
-    `city`           varchar(200)    NOT NULL DEFAULT '' COMMENT '市',
-    `subscribeTime`  datetime        NULL     DEFAULT null COMMENT '关注时间',
-    `subscribeScene` varchar(200)    NOT NULL DEFAULT '' COMMENT 'ADD_SCENE_SEARCH 关注方式',
-    `is_cancel`      tinyint         NOT NULL DEFAULT 1 COMMENT '是否取关 1关注 2已取消',
-    `created_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`     datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`             bigint unsigned NOT NULL AUTO_INCREMENT,
+    `wechat_user_id`  varchar(200)    NOT NULL DEFAULT '' COMMENT 'wechat_user_id',
+    `type`            tinyint         NOT NULL DEFAULT 1 COMMENT '服务类型 1正在 2摩登',
+    `open_id`         varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
+    `union_id`        varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
+    `nickname`        varchar(200)    NOT NULL DEFAULT '' COMMENT '昵称',
+    `sex_desc`        varchar(200)    NOT NULL DEFAULT '' COMMENT '性别',
+    `sex`             tinyint         NOT NULL DEFAULT 0 COMMENT '性别 男1',
+    `head_img_url`    varchar(200)    NOT NULL DEFAULT '' COMMENT '头像',
+    `language`        varchar(200)    NOT NULL DEFAULT '' COMMENT 'zh_CN',
+    `country`         varchar(200)    NOT NULL DEFAULT '' COMMENT '国家',
+    `province`        varchar(200)    NOT NULL DEFAULT '' COMMENT '省',
+    `city`            varchar(200)    NOT NULL DEFAULT '' COMMENT '市',
+    `subscribe_time`  datetime        NULL     DEFAULT null COMMENT '关注时间',
+    `subscribe_scene` varchar(200)    NOT NULL DEFAULT '' COMMENT 'ADD_SCENE_SEARCH 关注方式',
+    `created_at`      datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`      datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
-    KEY `sweet_wechat_user_user_id` (`user_id`)
+    KEY `idx_wechat_user_id` (`wechat_user_id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT '正在现场服务号关注事件储存用户信息表';
-alter table sweet_wechat_user add type tinyint NOT NULL DEFAULT 1 COMMENT '服务类型 1正在 2摩登' after user_id;
-
-alter table sweet_wechat_user add adam_user_id varchar(200) NOT NULL DEFAULT '' COMMENT 'adam用户id' after user_id;
-alter table sweet_wechat_user add adam_phone varchar(200) NOT NULL DEFAULT '' COMMENT 'adam用户手机号' after adam_user_id;
 
 -- 小程序登录记录用户解密后信息表
-drop TABLE if exists `sweet_applet_user`;
-CREATE TABLE `sweet_applet_user`
+drop TABLE if exists `sweet_applet_users`;
+CREATE TABLE `sweet_applet_users`
 (
-    `mid`                bigint unsigned NOT NULL AUTO_INCREMENT,
-    `user_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT 'user_id',
-    `openId`             varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
-    `unionId`            varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
-    `getPhoneNumber`     varchar(200)    NOT NULL DEFAULT '' COMMENT '手机号',
-    `getPurePhoneNumber` varchar(200)    NOT NULL DEFAULT '' COMMENT '手机号',
-    `getCountryCode`     varchar(200)    NOT NULL DEFAULT '' COMMENT '地区码',
-    `type`               tinyint         NOT NULL DEFAULT 0 COMMENT '1草莓 2五百里 3mdsk 4正在',
-    `created_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    `updated_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    `mid`               bigint unsigned NOT NULL AUTO_INCREMENT,
+    `applet_user_id`    varchar(200)    NOT NULL DEFAULT '' COMMENT 'applet_user_id',
+    `user_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT 'user_id',
+    `open_id`           varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
+    `union_id`          varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
+    `phone_number`      varchar(200)    NOT NULL DEFAULT '' COMMENT '手机号',
+    `pure_phone_number` varchar(200)    NOT NULL DEFAULT '' COMMENT '手机号',
+    `country_code`      varchar(200)    NOT NULL DEFAULT '' COMMENT '地区码',
+    `type`              tinyint         NOT NULL DEFAULT 0 COMMENT '1草莓 2五百里 3mdsk 4正在',
+    `created_at`        datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`        datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),
-    KEY `sweet_applet_user_user_id` (`user_id`),
-    UNIQUE KEY (openId, unionId, getPurePhoneNumber)
+    KEY `idx_applet_user_id` (`applet_user_id`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET utf8mb4
   COLLATE utf8mb4_unicode_ci
@@ -531,7 +527,7 @@ CREATE TABLE `sweet_remind`
 (
     `mid`            bigint unsigned NOT NULL AUTO_INCREMENT,
     `remind_id`      varchar(255)    NOT NULL DEFAULT '' COMMENT 'remind_id',
-    `openId`         varchar(255)     NOT NULL DEFAULT '' COMMENT 'openId',
+    `openId`         varchar(255)    NOT NULL DEFAULT '' COMMENT 'openId',
     `unionId`        varchar(255)    NOT NULL DEFAULT '' COMMENT 'unionId',
     `performancesId` varchar(255)    NOT NULL DEFAULT '' COMMENT '演出id',
     `is_push`        tinyint         NOT NULL DEFAULT 1 COMMENT '是否推送 1未推送 2已推送',

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

 package com.liquidnet.service.sweet.controller;
 
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.param.SweetOpenSendMsgParam;
 import com.liquidnet.service.sweet.service.impl.SweetWechatTemplateServiceImpl;
@@ -75,4 +76,21 @@ public class SweetWechatTemplateController {
         }
     }
 
+    @PostMapping("followStatusPhone")
+    @ApiOperation("获取关注状态通过手机号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", dataType = "Integer", name = "type", value = "type 1正在 2摩登", required = true),
+    })
+    public ResponseDto followStatusPhone(
+            @RequestParam() Integer type
+    ) {
+        String phone = (String) CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE);
+        boolean status = sweetTemplateService.followStatusPhone(type, phone);
+        if (status) {
+            return ResponseDto.success(1);
+        } else {
+            return ResponseDto.success(2);
+        }
+    }
+
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/handler/SubscribeHandler.java

@@ -5,12 +5,10 @@ import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.feign.stone.api.FeignStoneIntegralClient;
 import com.liquidnet.service.sweet.config.WechatMpConfigure;
 import com.liquidnet.service.sweet.service.impl.SweetWechatTemplateServiceImpl;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
-import com.liquidnet.service.sweet.vo.SweetWechatUsersRelationVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -47,9 +45,6 @@ public class SubscribeHandler implements WxMpMessageHandler {
     @Autowired
     private SweetWechatTemplateServiceImpl sweetWechatTemplateService;
 
-    @Autowired
-    private FeignStoneIntegralClient feignStoneIntegralClient;
-
     @Override
     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
                                     WxSessionManager sessionManager) throws WxErrorException {
@@ -70,15 +65,12 @@ public class SubscribeHandler implements WxMpMessageHandler {
             type = 1;
         } else {// 摩登服务号
             type = 2;
-            SweetWechatUsersRelationVo usersRelationUnionid = redisUtils.getSweetWechatUsersRelationUnionid(wxMpUser.getUnionId());
-            if (null != usersRelationUnionid) {
-                feignStoneIntegralClient.doTask(4, usersRelationUnionid.getUserId());
-            }
         }
         SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(wxMpUser.getUnionId(), type);
         if (null == sweetWechatUsers) {
             SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
-            sweetWechatUsersVo.setWechatId(IDGenerator.nextSnowId());
+            sweetWechatUsersVo.setWechatUserId(IDGenerator.nextSnowId());
+            sweetWechatUsersVo.setType(type);
             sweetWechatUsersVo.setOpenId(wxMpUser.getOpenId());
             sweetWechatUsersVo.setUnionId(wxMpUser.getUnionId());
             sweetWechatUsersVo.setNickname(wxMpUser.getNickname());
@@ -94,9 +86,9 @@ public class SubscribeHandler implements WxMpMessageHandler {
 
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-            sqls.add(SqlMapping.get("sweet_wechat_users_service.insert"));
+            sqls.add(SqlMapping.get("sweet_wechat_users.insert"));
             sqlsDataA.add(new Object[]{
-                    sweetWechatUsersVo.getWechatId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
+                    sweetWechatUsersVo.getWechatUserId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
                     sweetWechatUsersVo.getSexDesc(), sweetWechatUsersVo.getSex(), sweetWechatUsersVo.getHeadImgUrl(), sweetWechatUsersVo.getLanguage(),
                     sweetWechatUsersVo.getCountry(), sweetWechatUsersVo.getProvince(), sweetWechatUsersVo.getCity(),
                     sweetWechatUsersVo.getSubscribeTime(), sweetWechatUsersVo.getSubscribeScene()

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatUserServiceImpl.java → liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetAppletUsersServiceImpl.java

 package com.liquidnet.service.sweet.service.impl;
 
+import com.liquidnet.service.sweet.entity.SweetAppletUsers;
+import com.liquidnet.service.sweet.mapper.SweetAppletUsersMapper;
+import com.liquidnet.service.sweet.service.ISweetAppletUsersService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
-import com.liquidnet.service.sweet.mapper.SweetWechatUserMapper;
-import com.liquidnet.service.sweet.service.ISweetWechatUserService;
 import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 正在现场服务号关注事件储存用户信息表 服务实现类
+ * 小程序登录记录用户解密后信息表 服务实现类
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-08-03
+ * @since 2021-11-05
  */
 @Service
-public class SweetWechatUserServiceImpl extends ServiceImpl<SweetWechatUserMapper, SweetWechatUser> implements ISweetWechatUserService {
+public class SweetAppletUsersServiceImpl extends ServiceImpl<SweetAppletUsersMapper, SweetAppletUsers> implements ISweetAppletUsersService {
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -14,7 +14,7 @@ import com.liquidnet.service.sweet.dto.vo.WechatTokenInfoVo;
 import com.liquidnet.service.sweet.dto.vo.WechatUserInfoVo;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
-import com.liquidnet.service.sweet.vo.SweetWechatUsersRelationVo;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
@@ -50,8 +50,6 @@ public class SweetWechatLoginServiceImpl {
 
     @Autowired
     private FeignAdamBaseClient feignAdamBaseClient;
-    @Autowired
-    private FeignStoneIntegralClient feignStoneIntegralClient;
 
     public ResponseDto userInfo(String code, String encryptedData, String iv, Integer type) {
         log.info("小程序解密用户信息参数：[code=[{}], encryptedData=[{}], [iv=[{}], type=[{}]", code, encryptedData, iv, type);
@@ -68,67 +66,50 @@ public class SweetWechatLoginServiceImpl {
             if (Objects.isNull(wxMaPhoneNumberInfo) || StringUtils.isBlank(wxMaPhoneNumberInfo.getPhoneNumber())) {
                 return ResponseDto.failure("解密手机信息失败");
             }
-            String wechatId = IDGenerator.nextSnowId();
+            String appletUserId = IDGenerator.nextSnowId();
             String phoneNumber = wxMaPhoneNumberInfo.getPhoneNumber();
             String purePhoneNumber = wxMaPhoneNumberInfo.getPurePhoneNumber();
             String countryCode = wxMaPhoneNumberInfo.getCountryCode();
-            Integer userType = type + 20;
             // 获取adam用户信息 自动注册
             ResponseDto<AdamUserInfoVo> userInfoVo = feignAdamBaseClient.registerByMobile(wxMaPhoneNumberInfo.getPurePhoneNumber());
             AdamUserInfoVo userInfoVoData = userInfoVo.getData();
             String mobile = userInfoVoData.getMobile();
             String userId = userInfoVoData.getUid();
-            // mysql redis
-            SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(unionId, userType);
-            if (null == sweetWechatUsers) {
+            // mysql redis todo 一个手机号多个微信？？？
+            SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsers(mobile);
+            if (null == sweetAppletUsers) {
                 LinkedList<String> sqlsA = CollectionUtil.linkedListString();
                 LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                sqlsA.add(SqlMapping.get("sweet_wechat_users_applet.insert"));
+                sqlsA.add(SqlMapping.get("sweet_applet_users.insert"));
                 sqlsDataA.add(new Object[]{
-                        wechatId, openId, unionId, phoneNumber, purePhoneNumber, countryCode, userType
+                        appletUserId, userId, openId, unionId, phoneNumber, purePhoneNumber, countryCode, type
                 });
                 queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
                         SqlMapping.gets(sqlsA, sqlsDataA));
-                SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
-                sweetWechatUsersVo.setWechatId(wechatId);
-                sweetWechatUsersVo.setPhoneNumber(phoneNumber);
-                sweetWechatUsersVo.setPurePhoneNumber(purePhoneNumber);
-                sweetWechatUsersVo.setCountryCode(countryCode);
-                sweetWechatUsersVo.setType(userType);
-                sweetWechatUsersVo.setOpenId(openId);
-                sweetWechatUsersVo.setUnionId(unionId);
-                redisUtils.setSweetWechatUsers(sweetWechatUsersVo);
-            }
-            SweetWechatUsersRelationVo sweetWechatUsersRelation = redisUtils.getSweetWechatUsersRelation(mobile);
-            if (null == sweetWechatUsersRelation) {
-                LinkedList<String> sqlsB = CollectionUtil.linkedListString();
-                LinkedList<Object[]> sqlsDataB = CollectionUtil.linkedListObjectArr();
-                sqlsB.add(SqlMapping.get("sweet_wechat_users_relation.insert"));
-                String wechatRelationId = IDGenerator.nextSnowId();
-                sqlsDataB.add(new Object[]{
-                        wechatRelationId, unionId, userId, mobile
-                });
-                queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
-                        SqlMapping.gets(sqlsB, sqlsDataB));
-                SweetWechatUsersRelationVo usersRelationVo = SweetWechatUsersRelationVo.getNew();
-                usersRelationVo.setWechatRelationId(wechatRelationId);
-                usersRelationVo.setUnionId(unionId);
-                usersRelationVo.setUserId(userId);
-                usersRelationVo.setUserPhone(mobile);
-                redisUtils.setSweetWechatUsersRelation(usersRelationVo);
+                SweetAppletUsersVo sweetAppletUsersVo = SweetAppletUsersVo.getNew();
+                sweetAppletUsersVo.setAppletUserId(appletUserId);
+                sweetAppletUsersVo.setUserId(userId);
+                sweetAppletUsersVo.setOpenId(openId);
+                sweetAppletUsersVo.setUnionId(unionId);
+                sweetAppletUsersVo.setPhoneNumber(phoneNumber);
+                sweetAppletUsersVo.setPurePhoneNumber(purePhoneNumber);
+                sweetAppletUsersVo.setCountryCode(countryCode);
+                sweetAppletUsersVo.setType(type);
+                redisUtils.setSweetAppletUsers(sweetAppletUsersVo);
                 // 调用关注赠积分任务 这里如果不调用的话
                 // 1。关注过了也登陆过小程序的可以脚本处理 脚本不处理就需要每个用户点进入小程序登陆
                 // 2。关注过了 无小程序的 本次登陆才有的 接口也不是前端请求的 就没有地方触发做任务接口
                 // 3。有小程序未关注的就关注时候适用
-                SweetWechatUsersVo sweetWechatUsersSky = redisUtils.getSweetWechatUsers(unionId, 2);
+                /*SweetWechatUsersVo sweetWechatUsersSky = redisUtils.getSweetWechatUsers(unionId, 2);
                 if (null != sweetWechatUsersSky) {
                     feignStoneIntegralClient.doTask(4, userId);
-                }
+                }*/
             }
             // 返回给前端数据
             HashMap<String, Object> userInfo = CollectionUtil.mapStringObject();
             userInfo.put("unionId", unionId);
             userInfo.put("openId", openId);
+            userInfo.put("userId", userId);
             userInfo.put("getPhoneNumber", wxMaPhoneNumberInfo.getPhoneNumber());
             userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
             userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatTemplateServiceImpl.java

@@ -17,6 +17,7 @@ import com.liquidnet.service.sweet.param.SweetOpenSendMsgParam;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -317,4 +318,13 @@ public class SweetWechatTemplateServiceImpl {
         }
     }
 
+    public boolean followStatusPhone(Integer type, String phone) {
+        SweetAppletUsersVo sweetAppletUsers = redisUtils.getSweetAppletUsers(phone);
+        SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(sweetAppletUsers.getUnionId(), 2);
+        if (null != sweetWechatUsers && !sweetWechatUsers.getUnionId().isEmpty()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatUsersRelationServiceImpl.java

-package com.liquidnet.service.sweet.service.impl;
-
-import com.liquidnet.service.sweet.entity.SweetWechatUsersRelation;
-import com.liquidnet.service.sweet.mapper.SweetWechatUsersRelationMapper;
-import com.liquidnet.service.sweet.service.ISweetWechatUsersRelationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 微信用户信息关联表 服务实现类
- * </p>
- *
- * @author jiangxiulong
- * @since 2021-11-04
- */
-@Service
-public class SweetWechatUsersRelationServiceImpl extends ServiceImpl<SweetWechatUsersRelationMapper, SweetWechatUsersRelation> implements ISweetWechatUsersRelationService {
-
-}

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatUsersServiceImpl.java

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 微信用户信息表包含小程序公众号 服务实现类
+ * 正在现场服务号关注事件储存用户信息表 服务实现类
  * </p>
  *
  * @author jiangxiulong
- * @since 2021-11-04
+ * @since 2021-11-05
  */
 @Service
 public class SweetWechatUsersServiceImpl extends ServiceImpl<SweetWechatUsersMapper, SweetWechatUsers> implements ISweetWechatUsersService {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/UserDataServiceImpl.java

@@ -57,7 +57,8 @@ public class UserDataServiceImpl {
                     SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(wxMpUser.getUnionId(), type);
                     if (null == sweetWechatUsers) {
                         SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
-                        sweetWechatUsersVo.setWechatId(IDGenerator.nextSnowId());
+                        sweetWechatUsersVo.setWechatUserId(IDGenerator.nextSnowId());
+                        sweetWechatUsersVo.setType(type);
                         sweetWechatUsersVo.setOpenId(wxMpUser.getOpenId());
                         sweetWechatUsersVo.setUnionId(wxMpUser.getUnionId());
                         sweetWechatUsersVo.setNickname(wxMpUser.getNickname());
@@ -73,9 +74,9 @@ public class UserDataServiceImpl {
 
                         LinkedList<String> sqls = CollectionUtil.linkedListString();
                         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                        sqls.add(SqlMapping.get("sweet_wechat_users_service.insert"));
+                        sqls.add(SqlMapping.get("sweet_wechat_users.insert"));
                         sqlsDataA.add(new Object[]{
-                                sweetWechatUsersVo.getWechatId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
+                                sweetWechatUsersVo.getWechatUserId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
                                 sweetWechatUsersVo.getSexDesc(), sweetWechatUsersVo.getSex(), sweetWechatUsersVo.getHeadImgUrl(), sweetWechatUsersVo.getLanguage(),
                                 sweetWechatUsersVo.getCountry(), sweetWechatUsersVo.getProvince(), sweetWechatUsersVo.getCity(),
                                 sweetWechatUsersVo.getSubscribeTime(), sweetWechatUsersVo.getSubscribeScene()
@@ -103,7 +104,8 @@ public class UserDataServiceImpl {
         SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(wxMpUser.getUnionId(), type);
         if (null == sweetWechatUsers) {
             SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
-            sweetWechatUsersVo.setWechatId(IDGenerator.nextSnowId());
+            sweetWechatUsersVo.setWechatUserId(IDGenerator.nextSnowId());
+            sweetWechatUsersVo.setType(type);
             sweetWechatUsersVo.setOpenId(wxMpUser.getOpenId());
             sweetWechatUsersVo.setUnionId(wxMpUser.getUnionId());
             sweetWechatUsersVo.setNickname(wxMpUser.getNickname());
@@ -119,9 +121,9 @@ public class UserDataServiceImpl {
 
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-            sqls.add(SqlMapping.get("sweet_wechat_users_service.insert"));
+            sqls.add(SqlMapping.get("sweet_wechat_users.insert"));
             sqlsDataA.add(new Object[]{
-                    sweetWechatUsersVo.getWechatId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
+                    sweetWechatUsersVo.getWechatUserId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
                     sweetWechatUsersVo.getSexDesc(), sweetWechatUsersVo.getSex(), sweetWechatUsersVo.getHeadImgUrl(), sweetWechatUsersVo.getLanguage(),
                     sweetWechatUsersVo.getCountry(), sweetWechatUsersVo.getProvince(), sweetWechatUsersVo.getCity(),
                     sweetWechatUsersVo.getSubscribeTime(), sweetWechatUsersVo.getSubscribeScene()

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/WechatUsersRedisUtils.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.sweet.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.vo.SweetWechatUsersRelationVo;
+import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,31 +37,19 @@ public class WechatUsersRedisUtils {
         redisUtil.del(redisKey);
     }
 
-    public SweetWechatUsersRelationVo getSweetWechatUsersRelation(String mobile) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_RELATION_PHONE.concat(mobile);
+    public SweetAppletUsersVo getSweetAppletUsers(String mobile) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(mobile);
         Object obj = redisUtil.get(redisKey);
         if (null == obj) {
             return null;
         } else {
-            SweetWechatUsersRelationVo sweetWechatUsersRelationVo = (SweetWechatUsersRelationVo) obj;
-            return sweetWechatUsersRelationVo;
+            SweetAppletUsersVo sweetAppletUsersVo = (SweetAppletUsersVo) obj;
+            return sweetAppletUsersVo;
         }
     }
-    public SweetWechatUsersRelationVo getSweetWechatUsersRelationUnionid(String mobile) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_RELATION_PHONE.concat(mobile);
-        Object obj = redisUtil.get(redisKey);
-        if (null == obj) {
-            return null;
-        } else {
-            SweetWechatUsersRelationVo sweetWechatUsersRelationVo = (SweetWechatUsersRelationVo) obj;
-            return sweetWechatUsersRelationVo;
-        }
-    }
-    public void setSweetWechatUsersRelation(SweetWechatUsersRelationVo usersRelationVo) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_RELATION_PHONE.concat(usersRelationVo.getUserPhone());
-        String redisKey2 = SweetConstant.REDIS_KEY_SWEET_WECHAT_USERS_RELATION_UNIONID.concat(usersRelationVo.getUnionId());
-        redisUtil.set(redisKey, usersRelationVo);
-        redisUtil.set(redisKey2, usersRelationVo);
+    public void setSweetAppletUsers(SweetAppletUsersVo sweetAppletUsersVo) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_APPLET_USERS_PHONE.concat(sweetAppletUsersVo.getPurePhoneNumber());
+        redisUtil.set(redisKey, sweetAppletUsersVo);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -35,9 +35,6 @@ sweet_luck_draw.insert=INSERT INTO sweet_luck_draw (mobile,union_id,luck_draw_nu
 
 # --------------------------答案--------------------------
 sweet_answer.insert=INSERT INTO sweet_answer (answer_id,phone,answer_json,img_url) VALUES (?,?,?,?)
-# --------------------------关注/取消服务号的用户信息--------------------------
-sweet_user.insert=INSERT INTO sweet_wechat_user (user_id,type,openId,unionId,nickname,sexDesc,sex,headImgUrl,language,country,province,city,subscribeTime,subscribeScene) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-sweet_user.update2=UPDATE sweet_wechat_user SET adam_user_id = ?, adam_phone = ?, updated_at = ?  WHERE unionId = ? and type = ?
 # --------------------------提醒记录--------------------------
 sweet_remind.insert=INSERT INTO sweet_remind (remind_id,openId,unionId,performancesId) VALUES (?,?,?,?)
 # --------------------------用户投票记录--------------------------
@@ -50,8 +47,8 @@ sweet_antigenic_question.insert=INSERT INTO sweet_antigenic_question (question_i
 integral_activity_draw.insert=INSERT INTO sweet_integral_activity_draw (draw_id,integral_activity_id,activity_num,prize_id,prize_title,prize_type,prize_type_num,relation_id,user_id,nickname,receiving_status) VALUES (?,?,?,?,?,?,?,?,?,?,?)
 integral_activity_draw.update=UPDATE sweet_integral_activity_draw SET receiving_addresses_id = ?, receiving_name = ?, receiving_phone = ?, receiving_address = ?, receiving_province = ?, receiving_city = ?, receiving_county = ?, updated_at = ? WHERE draw_id = ?
 
-# --------------------------微信用户信息表包含小程序公众号--------------------------
-sweet_wechat_users_applet.insert=INSERT INTO sweet_wechat_users (wechat_id,open_id,union_id,phone_number,pure_phone_number,country_code,type) VALUES (?,?,?,?,?,?,?)
-sweet_wechat_users_service.insert=INSERT INTO sweet_wechat_users (wechat_id,type,open_id,union_id,nickname,sex_desc,sex,head_img_url,language,country,province,city,subscribe_time,subscribe_scene) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-sweet_wechat_users.delete=DELETE FROM sweet_wechat_users WHERE unionId = ? and type = ?
-sweet_wechat_users_relation.insert=INSERT INTO sweet_wechat_users_relation (wechat_relation_id,union_id,user_id,user_phone) VALUES (?,?,?,?)
+# --------------------------小程序登录记录用户解密后信息--------------------------
+sweet_applet_users.insert=INSERT INTO sweet_applet_users (applet_user_id,user_id,open_id,union_id,phone_number,pure_phone_number,country_code,type) VALUES (?,?,?,?,?,?,?,?)
+# --------------------------微信用户信息表公众号--------------------------
+sweet_wechat_users.insert=INSERT INTO sweet_wechat_users (wechat_user_id,type,open_id,union_id,nickname,sex_desc,sex,head_img_url,language,country,province,city,subscribe_time,subscribe_scene) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+sweet_wechat_users.delete=DELETE FROM sweet_wechat_users WHERE union_id = ? and type = ?
\ No newline at end of file