From 0622fc9c8a464a1260ebca4071a2cad9c83a5a9a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 12 九月 2019 15:52:42 +0800
Subject: [PATCH] 返利奖励券 跳转订单 不显示订单上方统计信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
index 2b49b9d..cfc23fe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.bus.user.UserRankRecord;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.exception.ThreeSaleException;
+import com.yeshi.fanli.exception.user.ThreeSaleException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -322,7 +322,7 @@
}
@Override
- public String activateInviteCode(Long uid, String inviteCode, String platform, String version) throws UserInfoExtraException{
+ public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException{
if (uid == null || inviteCode == null) {
throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
}
@@ -349,7 +349,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter, platform, version);
+ threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -384,7 +384,7 @@
@Override
- public void activationInviteWX(Long uid, String code, String platform, String version) throws UserInfoExtraException{
+ public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{
if (uid == null || code == null) {
throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
}
@@ -405,7 +405,7 @@
}
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code);
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -426,14 +426,25 @@
UserInfo updateUserInfo = new UserInfo(uid);
updateUserInfo.setWxOpenId(weiXinUser.getOpenid());
updateUserInfo.setWxUnionId(weiXinUser.getUnionid());
- if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
- updateUserInfo.setWxName(weiXinUser.getNickname());
- updateUserInfo.setNickName(weiXinUser.getNickname());
+ updateUserInfo.setWxName(weiXinUser.getNickname());
+ updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
+
+ // 灏嗛粯璁ゆ樀绉版浛鎹㈡垚寰俊鏄电О
+ String defaultNickName = Constant.systemCommonConfig.getDefaultNickName();
+ if (!StringUtil.isNullOrEmpty(defaultNickName) && !StringUtil.isNullOrEmpty(weiXinUser.getNickname())) {
+ defaultNickName = defaultNickName + uid;
+ if ((defaultNickName.equals(invitee.getNickName()) || "杩斿埄鍒�".equals(invitee.getNickName()))) {
+ updateUserInfo.setNickName(weiXinUser.getNickname());
+ }
}
- if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {
- updateUserInfo.setWxPic(weiXinUser.getHeadimgurl());
+
+ // 灏嗛粯璁ゅご鍍忔浛鎹㈡垚寰俊澶村儚
+ String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait();
+ if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait)
+ && defaultPortrait.equals(invitee.getPortrait())) {
updateUserInfo.setPortrait(weiXinUser.getHeadimgurl());
}
+
userInfoService.updateByPrimaryKeySelective(updateUserInfo);
} else if (!wxUnionId.equals(wxUnionIdExist)){
@@ -465,7 +476,7 @@
// 缁戝畾鍏崇郴
try {
- threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale, platform, version);
+ threeSaleSerivce.bindRelationshipByWX(invitee, inviterId, threeSale);
} catch (ThreeSaleException e) {
try {
LogHelper.errorDetailInfo(e);
--
Gitblit v1.8.0