From 7ad7905f32ef6b2d67bbd45260a0413be904fa8d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 20 九月 2019 14:33:08 +0800
Subject: [PATCH] 品牌 、金币任务bug
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 a30b7c6..5988c7f 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
@@ -16,6 +16,7 @@
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
+import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
@@ -26,7 +27,6 @@
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -34,6 +34,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteRecordService;
import com.yeshi.fanli.service.inter.user.UserRankService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
@@ -384,7 +385,7 @@
@Override
- public void activationInviteWX(Long uid, String code) throws UserInfoExtraException{
+ public void activationInviteWX(WXAccountInfoDTO wxAccount, Long uid, String code) throws UserInfoExtraException{
if (uid == null || code == null) {
throw new UserInfoExtraException(1, "婵�娲讳俊鎭笉瀹屾暣");
}
@@ -405,7 +406,7 @@
}
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUserWithSavePortrait(code,wxAccount.getAppId(),wxAccount.getAppSecret());
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
@@ -512,6 +513,19 @@
return userInfoExtraMapper.getInfoExtraByUid(uid);
}
+
+ @Override
+ public UserInfoExtra getByUidForUpdate(Long uid) {
+ return userInfoExtraMapper.getByUidForUpdate(uid);
+ }
+
+
+ @Override
+ public void updateGoldCoin(Long id, Integer goldCoin) {
+ userInfoExtraMapper.updateGoldCoin(id, goldCoin);
+ }
+
+
@Override
public UserInfoExtraVO getInfoExtraVOByUid(Long uid) {
return userInfoExtraMapper.getInfoExtraVOByUid(uid);
@@ -608,7 +622,7 @@
@Override
- public UserInfo getInviterInfo(Long uid, String code) throws UserInfoExtraException{
+ public UserInfo getInviterInfo(WXAccountInfoDTO wxAccount,Long uid, String code) throws UserInfoExtraException{
if (code == null) {
throw new UserInfoExtraException(1, "code淇℃伅涓嶅畬鏁�");
}
@@ -629,7 +643,7 @@
}
// 鑾峰彇寰俊淇℃伅
- WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code);
+ WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code,wxAccount.getAppId(),wxAccount.getAppSecret());
if (weiXinUser == null) {
throw new UserInfoExtraException(1, "寰俊鎺堟潈澶辫触");
}
--
Gitblit v1.8.0