dotask

liquidnet-bus-feign/liquidnet-api-feign-stone/src/main/java/com/liquidnet/service/feign/stone/api/FeignStoneIntegralClient.java

@@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.HashMap;
+
 /**
  * <p>
  * 积分接口
@@ -47,4 +49,11 @@ public interface FeignStoneIntegralClient {
             @RequestParam(value = "content") String content
     );
 
+    // 做积分任务
+    @PostMapping(value = "user/inner/doTask")
+    ResponseDto<HashMap<String, Object>> doTask(
+            @RequestParam(value = "taskId") Integer taskId,
+            @RequestParam(value = "uid") String uid
+    );
+
 }

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

@@ -22,10 +22,15 @@ 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_WECHAT_USER_UNIONID_PHONE="sweet:wechatUser:phone:";
+    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:";
@@ -33,10 +38,6 @@ public class SweetConstant {
     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 final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_MODERNSKY="sweet:wechatUser:modernsky:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_STR_MODERNSKY="sweet:wechatUser:modernsky:unionIdStr:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_MODERNSKY="sweet:wechatUser:modernsky:openId:";
-
 //    public enum ManualPosition {
 //        artist("艺人","artist"),
 //        signingTime("签售时间","signingTime"),
@@ -93,6 +94,7 @@ public class SweetConstant {
     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:";

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

@@ -3,11 +3,13 @@ package com.liquidnet.service.sweet.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
 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.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -69,6 +71,9 @@ public class SweetWechatTemplateServiceImpl {
     @Autowired
     WechatMaConfigure wechatMaConfigure;
 
+    @Autowired
+    private FeignStoneIntegralClient feignStoneIntegralClient;
+
     public ResponseDto openSendMsg(SweetOpenSendMsgParam param) {
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_TEMPLATE_MSG.getKey(),
                 JsonUtils.toJson(param));
@@ -250,17 +255,6 @@ public class SweetWechatTemplateServiceImpl {
         return ResponseDto.success();
     }
 
-    public boolean followStatusStr(String unionId) {
-        String str = redisDataUtils.getSweetWechatUserStr(unionId);
-
-        if (null == str || str.isEmpty()) {
-            redisDataUtils.setSweetWechatUserStr(unionId);
-            return false;
-        } else {
-            return true;
-        }
-    }
-
     public boolean followStatus(String unionId, Integer type, String userId, String phone) {
         SweetWechatUser sweetWechatUser = null;
         if (null == type || type <= 1) {
@@ -282,8 +276,6 @@ public class SweetWechatTemplateServiceImpl {
             if ((!phone.isEmpty() || !userId.isEmpty()) && (oldAdamUserId.isEmpty() || oldAdamPhone.isEmpty())) {
                 if (phone.isEmpty()) {
                     phone = oldAdamPhone;
-                } else {
-                    redisDataUtils.setUnionIdByPhone(phone, unionId);
                 }
                 if (userId.isEmpty()) {
                     userId = oldAdamUserId;
@@ -291,8 +283,25 @@ public class SweetWechatTemplateServiceImpl {
                 sweetWechatUser.setAdamPhone(phone);
                 sweetWechatUser.setAdamUserId(userId);
                 if (null == type || type <= 1) {
+                    if (!phone.isEmpty()) {
+                        redisDataUtils.setUnionIdByPhone(phone, unionId);
+                    }
+                    if (!userId.isEmpty()) {
+                        redisDataUtils.setUnionIdByUserId(userId, unionId);
+                    }
                     redisDataUtils.setSweetWechatUser(sweetWechatUser);
                 } else if (type == 2) {
+                    if (!phone.isEmpty()) {
+                        CurrentUtil.getTokenClaims().get(CurrentUtil.TOKEN_MOBILE);
+                        redisDataUtils.setUnionIdByPhoneSky(phone, unionId);
+                    }
+                    if (!userId.isEmpty()) {
+                        redisDataUtils.setUnionIdByUserIdSky(userId, unionId);
+                    }
+                    // 调用关注加积分任务 多次调用没事
+                    if (!userId.isEmpty()) {
+                        feignStoneIntegralClient.doTask(4, userId);
+                    }
                     redisDataUtils.setSweetWechatUserModernsky(sweetWechatUser);
                 }
 

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

@@ -341,20 +341,22 @@ public class RedisDataUtils {
         return (String) redisUtil.get(redisKey);
     }
 
-    public String getUnionIdByPhone(String phone) {
-        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE.concat(phone);
-        Object obj = redisUtil.get(redisKey);
-        if (null == obj) {
-            return "";
-        } else {
-            return (String) redisUtil.get(redisKey);
-        }
-    }
-
     public void setUnionIdByPhone(String phone, String unionId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE.concat(phone);
         redisUtil.set(redisKey, unionId);
     }
+    public void setUnionIdByUserId(String userId, String unionId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID.concat(userId);
+        redisUtil.set(redisKey, unionId);
+    }
+    public void setUnionIdByPhoneSky(String phone, String unionId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_PHONE_MODERNSKY.concat(phone);
+        redisUtil.set(redisKey, unionId);
+    }
+    public void setUnionIdByUserIdSky(String userId, String unionId) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY.concat(userId);
+        redisUtil.set(redisKey, unionId);
+    }
 
     public SweetWechatUser getSweetWechatUser(String unionid) {
         if (unionid.isEmpty()) {
@@ -378,20 +380,6 @@ public class RedisDataUtils {
         }
     }
 
-    public String getSweetWechatUserStr(String unionid) {
-        if (unionid.isEmpty()) {
-            return "";
-        }
-        String key = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO_STR.concat(unionid);
-        String str = (String) redisUtil.get(key);
-        return str;
-    }
-
-    public void setSweetWechatUserStr(String unionid) {
-        String key = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO_STR.concat(unionid);
-        redisUtil.set(key, "1");
-    }
-
     public void delSweetWechatUser(String unionid, String openid) {
         if (!unionid.isEmpty()) {
             String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(unionid);