From ca1ad791b7b7b04e57db6bd4fb93f0c1066a9f99 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 九月 2020 18:31:23 +0800
Subject: [PATCH] 淘口令格式兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
index 438aba8..608c29f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/InviteControllerV2.java
@@ -33,7 +33,6 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
import com.yeshi.fanli.entity.bus.user.UserInviteValidRecord;
-import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.bus.user.invite.TeamDailyRecord;
import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic;
import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
@@ -72,15 +71,16 @@
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.user.UserLevelUtil;
-import com.yeshi.fanli.util.wx.WXLoginUtil;
import com.yeshi.fanli.vo.order.OrderRankingVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.yeshi.utils.entity.wx.WeiXinUser;
+import org.yeshi.utils.wx.WXAppLoginUtil;
@Controller
@RequestMapping("api/v2/invite")
@@ -187,7 +187,7 @@
try {
WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());
+ WeiXinUser weiXinUser = WXAppLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());
if (weiXinUser == null)
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
@@ -721,7 +721,7 @@
try {
List<String> listIOS = new ArrayList<String>();
List<String> listAndroid = new ArrayList<String>();
- pushService.pushZNX(remindId, title, content, listIOS, listAndroid);
+ pushService.pushZNX(remindId, title, content, listIOS, listAndroid,acceptData.getSystem());
userSystemMsgService.addUserSystemMsg(remindId, UserSystemMsgTypeEnum.common, title, content,
UserSystemMsg.TIME_TAG_COMMON, null);
--
Gitblit v1.8.0