From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index f9c6fbf..bb37e7b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -44,7 +44,6 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
@@ -63,9 +62,6 @@
@Resource
private UserInfoService userInfoService;
-
- @Resource
- private HongBaoService hongBaoService;
@Resource
private ConfigService configService;
@@ -90,10 +86,9 @@
@Resource
private ShareMapper shareMapper;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {
List<UserInfo> list = null;
@@ -104,6 +99,16 @@
list = userInfoDao.list("from UserInfo u where u.wxUnionId=? and u.appId = ? ",
new Serializable[] { openid, appid });
}
+
+ if (list != null)
+ for (int i = 0; i < list.size(); i++) {
+ if (list.get(i).getState() == UserInfo.STATE_DELETE
+ || list.get(i).getState() == UserInfo.STATE_DELETE_OUT_OF_DATE) {
+ list.remove(i);
+ i--;
+ }
+ }
+
if (list != null && list.size() > 0) {
return list.get(0);
}
@@ -150,8 +155,6 @@
return form;
}
- if (form.getSystem().getId() != 7)
- hongBaoService.setNewUserHongBao(form, 1);
LogHelper.userInfo("娣诲姞鐢ㄦ埛:" + form);
if (form.getLoginType() == Constant.WEIXIN) {
// final UserInfo temp = form;
@@ -425,7 +428,7 @@
String wxUnionId = weiXinUser.getUnionid();
UserInfo find = getUserByLoginTypeAndOpenId(Constant.WEIXIN, wxUnionId, Constant.APPID);
- if (find == null||find.getState()==UserInfo.STATE_DELETE||find.getState()==UserInfo.STATE_DELETE_OUT_OF_DATE) {
+ if (find == null) {
find = new UserInfo();
find.setAppId(Constant.APPID);
find.setWxUnionId(weiXinUser.getUnionid());
@@ -701,7 +704,7 @@
// 鍘嗗彶鎬昏鍗�
long totalOrder = hongBaoV2CountService.countValidNumberByUid(uid, null);
-
+
// 浠婃棩鎬昏鍗�
long todayOrder = hongBaoV2CountService.countValidNumberByUid(uid, 1);
// 鏈湀鎬昏鍗�
@@ -710,24 +713,20 @@
userInfoAdmin.setTotalOrder(totalOrder);
userInfoAdmin.setTodayOrder(todayOrder);
userInfoAdmin.setMonthOrder(monthOrder);
-
-
+
// 鏈鍙栫孩鍖� 寰呭叆璐﹂噾棰�
BigDecimal unaccountedMoney = hongBaoV2CountService.countWillGetMoneyByUid(uid);
- if (unaccountedMoney ==null) {
+ if (unaccountedMoney == null) {
unaccountedMoney = new BigDecimal(0);
}
userInfoAdmin.setUnaccountedMoney(unaccountedMoney.toString());
// 鍘嗗彶鎬绘敹鐩�
- BigDecimal totalMoneyHistory = hongBaoV2CountService.countMoneyByUidAndState(uid,3);
- if (totalMoneyHistory ==null) {
+ BigDecimal totalMoneyHistory = hongBaoV2CountService.countMoneyByUidAndState(uid, 3);
+ if (totalMoneyHistory == null) {
totalMoneyHistory = new BigDecimal(0);
}
userInfoAdmin.setTotalMoneyHistory(totalMoneyHistory.toString());
-
-
-
// 鏀粯瀹濊处鍙� 绱杞处鎬婚噾棰�
double totalMoney = payInfoMapper.sumMoneyByUid(uid);
@@ -814,6 +813,7 @@
/**
* 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴�
+ *
* @param phone
* @param inviteCode
* @return
@@ -822,5 +822,5 @@
public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {
return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);
}
-
+
}
--
Gitblit v1.8.0