Browse Source

fix:用户关注未完善信息提醒

陈长荣 6 months ago
parent
commit
81778452cf

+ 9 - 6
snowy-web-app/src/main/java/vip/xiaonuo/weixin/gongzhong/config/WxMpConfiguration.java

@@ -25,6 +25,7 @@ import vip.xiaonuo.coldchain.modular.push.config.PushConfigure;
 import vip.xiaonuo.dev.modular.config.service.DevConfigService;
 
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * WxJava 公众号配置
@@ -104,16 +105,18 @@ public class WxMpConfiguration {
                     public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
                         log.info("用户关注 {}", wxMessage);
                         AlarmUser alarmUser = alarmUserService.subscribe(wxMessage.getFromUser());
+                        String msg;
                         if (alarmUser != null) {
-                            return WxMpXmlOutMessage.TEXT()
-                                    .content("【冷链驿站】欢迎回来," + alarmUser.getNickName())
-                                    .fromUser(wxMessage.getToUser())
-                                    .toUser(wxMessage.getFromUser())
-                                    .build();
+                            msg = "【冷链驿站】欢迎回来," + alarmUser.getNickName() + "。";
+                            if (Objects.equals("-1", alarmUser.getCreateOrg())) {
+                                msg += "请先<a href=\"" + getAuthUrl() + "\">完善信息</a>";
+                            }
+                        } else {
+                            msg = "【冷链驿站】为您提供温湿度、二氧化碳等环境监控数据查询及实时报警通知服务。请先<a href=\"" + getAuthUrl() + "\">完善信息</a>";
                         }
 
                         return WxMpXmlOutMessage.TEXT()
-                                .content("【冷链驿站】为您提供温湿度、二氧化碳等环境监控数据查询及实时报警通知服务。请先<a href=\"" + getAuthUrl() + "\">完善信息</a>")
+                                .content(msg)
                                 .fromUser(wxMessage.getToUser())
                                 .toUser(wxMessage.getFromUser())
                                 .build();