From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 163 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 147 insertions(+), 16 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 6380155..4cedf0c 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
@@ -1,6 +1,8 @@
package com.yeshi.fanli.service.impl.user;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -9,7 +11,6 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
-import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
@@ -17,12 +18,17 @@
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
import com.yeshi.fanli.entity.bus.user.UserRankRecord;
+import com.yeshi.fanli.exception.ThreeSaleException;
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.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserRankService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
@@ -43,6 +49,13 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserInfoService userInfoService;
+
@Override
public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
@@ -52,19 +65,19 @@
throw new UserInfoExtraException(1, "鐢ㄦ埛闄勫姞淇℃伅涓嶅瓨鍦�");
}
- // 绛夌骇鍒楄〃
- List<UserRank> listRank = userRankService.getAllRank();
- if (listRank == null || listRank.size() == 0) {
- throw new UserInfoExtraException(1, "绯荤粺绛夌骇涓嶅瓨鍦�");
- }
- extraVO.setListRank(listRank);
-
+ // 绛夌骇瀵圭収琛�
+ String contrast = configService.get("user_rank_contrast");
+ extraVO.setRankContrast(contrast);
// 鐗瑰埆鎻愰啋
String rankTip = configService.get("user_rank_tip");
extraVO.setRankTip(rankTip);
Integer rankOrderNum = extraVO.getRankOrderNum();
- if (rankOrderNum != null && rankOrderNum > 0) {
+
+ UserRank userRank = extraVO.getUserRank();
+ // 闈掗摐绛夌骇涓嶈繑鍥炴伃鍠滆鍙� 娉細闈掗摐绛夌骇id 蹇呴』涓�1
+ if (userRank != null && userRank.getId() != null && userRank.getId() > 1) {
+
String rankMsg = null;
Integer rankSource = extraVO.getRankSource();
switch (rankSource) {
@@ -127,8 +140,11 @@
if (userInfoExtra != null && userInfoExtra.getId() != null) {
// 鍒ゆ柇褰撴湀鏄惁宸叉洿鏂�
Date rankUpdateTime = userInfoExtra.getRankUpdateTime();
- if (rankUpdateTime != null && DateUtil.isSameMonth(rankUpdateTime, new Date())) {
- isupdateRank = false;
+ if (rankUpdateTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+ if (sdf.format(rankUpdateTime).equals(sdf.format(new Date()))) {
+ isupdateRank = false;
+ }
}
} else {
userInfoExtra = new UserInfoExtra();
@@ -215,13 +231,17 @@
rank = userRank;
// 榛樿鏈�浣庣瓑绾�:闈掗摐
userInfoExtra.setUserRank(rank);
- userInfoExtra.setRankOrderNum(0);
+ userInfoExtra.setRankOrderNum(selfOrderNum);
userInfoExtra.setRankSource(Constant.TYPE_REBATE);
break;
}
}
- // 绛夌骇鏇存柊鏃堕棿
- userInfoExtra.setRankUpdateTime(new Date());
+
+ // 绛夌骇鏇存柊鏃堕棿 褰撴湀1鍙�
+ Calendar calendar1=Calendar.getInstance();
+ calendar1.set(Calendar.DAY_OF_MONTH, 1);
+ userInfoExtra.setRankUpdateTime(calendar1.getTime());
+
// 淇濆瓨淇℃伅骞惰繑鍥�
saveUserInfoExtra(userInfoExtra);
@@ -264,8 +284,119 @@
}
}
-
return userInfoExtra;
}
-
+
+ @Override
+ public String activateInviteCode(Long uid, String inviteCode) throws UserInfoExtraException{
+ if (uid == null || inviteCode == null) {
+ throw new UserInfoExtraException(1, "鐢ㄦ埛id銆侀個璇风爜涓嶈兘涓虹┖");
+ }
+
+ UserInfoExtra extra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (extra != null) {
+ String inviteCodeHas = extra.getInviteCode();
+ if (inviteCodeHas != null && inviteCodeHas.trim().length() > 0) {
+ throw new UserInfoExtraException(1, "宸插瓨鍦ㄩ個璇风爜,璇峰埛鏂伴〉闈�");
+ }
+ }
+
+ // 琚個璇蜂汉淇℃伅
+ UserInfo invitee = userInfoService.selectByPKey(uid);
+ if (invitee == null) {
+ throw new UserInfoExtraException(1, "鐢ㄦ埛涓嶅瓨鍦�");
+ }
+
+ // 閭�璇蜂汉淇℃伅
+ UserInfo inviter = userInfoService.getInfoByPhoneOrInviteCode(inviteCode, inviteCode);
+ if (inviter == null) {
+ throw new UserInfoExtraException(1, "璇疯緭鍏ユ湁鏁堢殑閭�璇风爜");
+ }
+
+ // 缁戝畾鍏崇郴
+ try {
+ threeSaleSerivce.bindRelationshipByInviteCode(invitee, inviter);
+ } catch (ThreeSaleException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ throw new UserInfoExtraException(1, "婵�娲诲け璐�");
+ }
+
+
+ // 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
+ String code = UserUtil.getInviteCode(uid);
+ if (code == null || code.trim().length() == 0) {
+ throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
+ }
+
+ UserInfoExtra userInfoExtra = new UserInfoExtra();
+ userInfoExtra.setUserInfo(invitee);
+ userInfoExtra.setInviteCode(code);
+
+ // 淇濆瓨棰濆淇℃伅
+ saveUserInfoExtra(userInfoExtra);
+
+
+ Long id = userInfoExtra.getId();
+ if (id == null) {
+ throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
+ }
+
+ return code;
+ }
+
+ @Override
+ public UserInfoExtra getUserInfoExtra(Long uid) {
+ return userInfoExtraMapper.getInfoExtraByUid(uid);
+ }
+
+ @Override
+ public UserInfoExtraVO getInfoExtraVOByUid(Long uid) {
+ return userInfoExtraMapper.getInfoExtraVOByUid(uid);
+ }
+
+
+ @Override
+ public String getUserInviteCode(Long uid) throws UserInfoExtraException {
+
+ UserInfoExtra userInfoExtra = userInfoExtraMapper.getInfoExtraByUid(uid);
+ if (userInfoExtra == null) {
+ userInfoExtra = new UserInfoExtra();
+ }
+
+ // 閭�璇风爜
+ String inviteCode = userInfoExtra.getInviteCode();
+
+ if (inviteCode == null || inviteCode.trim().length() == 0) {
+ // 鍒ゆ柇鐢ㄦ埛
+ int relationshipNum = threeSaleSerivce.getSuccessRelationshipNum(uid);
+
+ if (relationshipNum > 0) {
+ // 閭�璇风爜鏈夋晥銆佺敓鎴愰個璇风爜
+ inviteCode = UserUtil.getInviteCode(uid);
+ if (inviteCode == null || inviteCode.trim().length() == 0) {
+ throw new UserInfoExtraException(1, "婵�娲荤爜鐢熸垚澶辫触");
+ }
+
+ // 淇濆瓨閭�璇风爜
+ userInfoExtra.setUserInfo(new UserInfo(uid));
+ userInfoExtra.setInviteCode(inviteCode);
+ // 淇濆瓨闄勫姞淇℃伅
+ saveUserInfoExtra(userInfoExtra);
+ }
+ }
+
+ return inviteCode;
+ }
+
+ @Override
+ public long countByRankId(Long rankId) {
+ return userInfoExtraMapper.countByRankId(rankId);
+ }
+
+
+
}
--
Gitblit v1.8.0