Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5,6 +5,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
+import com.liquidnet.service.sweet.entity.SweetWechatUser;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import com.liquidnet.service.sweet.vo.SweetRemindVo;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -51,20 +52,24 @@ public class SweetWechatTemplateServiceImpl {
         if (!CollectionUtils.isEmpty(keys)) {
             for (String rkey : keys) {
                 SweetRemindVo remindInfo = (SweetRemindVo) redisUtil.get(rkey);
+                SweetWechatUser sweetWechatUser = redisDataUtils.getSweetWechatUser(remindInfo.getUnionId());
+                if (null == sweetWechatUser) {
+                    continue;
+                }
                 // 发送模板消息接口
                 WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
                         // 接收者openid
-                        .toUser(remindInfo.getOpenId())
+                        .toUser(sweetWechatUser.getOpenId())
                         // 模板id
                         .templateId(templateId)
                         // 模板跳转链接
-                        .url("http://www.baidu.com")
+//                        .url("")
                         .build();
                 // 添加模板数据
-                templateMessage.addData(new WxMpTemplateData("first", "您好", "#FF00FF"))
-                        .addData(new WxMpTemplateData("keyword1", "这是个测试", "#A9A9A9"))
-                        .addData(new WxMpTemplateData("keyword2", "这又是个测试", "#FF00FF"))
-                        .addData(new WxMpTemplateData("remark", "这还是个测试", "#000000"));
+                templateMessage.addData(new WxMpTemplateData("first", "您好"))
+                        .addData(new WxMpTemplateData("keyword1", "演出名称"))
+                        .addData(new WxMpTemplateData("keyword3", "场馆"))
+                        .addData(new WxMpTemplateData("remark", "备注"));
                 String msgId = null;
                 try {
                     // 发送模板消息

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

@@ -281,5 +281,12 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(sweetWechatUser.getUnionId());
         redisUtil.set(redisKey, sweetWechatUser);
     }
+    public SweetWechatUser getSweetWechatUser(String unionid) {
+        if (unionid.isEmpty()) {
+            return null;
+        }
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(unionid);
+        return (SweetWechatUser) redisUtil.get(redisKey);
+    }
 
 }