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 | 68 +++++++++++++++++++++++---------- 1 files changed, 47 insertions(+), 21 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 0ec77c2..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 @@ -37,14 +37,13 @@ import com.yeshi.fanli.entity.admin.UserInfoAdmin; import com.yeshi.fanli.entity.bus.user.BindingAccount; import com.yeshi.fanli.entity.bus.user.InviteUser; -import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.WeiXinUser; import com.yeshi.fanli.entity.system.System; import com.yeshi.fanli.exception.ThreeSaleException; import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.config.ConfigService; -import com.yeshi.fanli.service.inter.hongbao.HongBaoService; +import com.yeshi.fanli.service.inter.count.HongBaoV2CountService; 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; @@ -91,6 +87,9 @@ @Resource private ShareMapper shareMapper; + @Resource + private HongBaoV2CountService hongBaoV2CountService; + public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) { List<UserInfo> list = null; if (loginType == 1) { @@ -100,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); } @@ -146,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; @@ -618,7 +625,7 @@ @Override public UserInfo getUserByIdWithMybatis(long uid) { - UserInfo user = userInfoMapper.selectByPrimaryKey(uid); + UserInfo user = userInfoMapper.selectByPKey(uid); return UserUtil.filterForClientUser(user); } @@ -688,23 +695,38 @@ } // 鏈�鍚庝竴娆′笅鍗曟椂闂� - Long lastOrderTime = hongBaoService.getLastOrderTime(uid); + Date lastOrderTime = hongBaoV2CountService.getLastHongBaoTime(uid); if (lastOrderTime == null) { userInfoAdmin.setLastOrderTime(0); } else { - userInfoAdmin.setLastOrderTime(lastOrderTime); + userInfoAdmin.setLastOrderTime(lastOrderTime.getTime()); } // 鍘嗗彶鎬昏鍗� - long totalOrder = hongBaoService.countByUidSelf(uid, null, null); + long totalOrder = hongBaoV2CountService.countValidNumberByUid(uid, null); + // 浠婃棩鎬昏鍗� - long todayOrder = hongBaoService.countByUidSelf(uid, 1, null); + long todayOrder = hongBaoV2CountService.countValidNumberByUid(uid, 1); // 鏈湀鎬昏鍗� - long monthOrder = hongBaoService.countByUidSelf(uid, null, 1); + long monthOrder = hongBaoV2CountService.countValidNumberByUid(uid, 2); userInfoAdmin.setTotalOrder(totalOrder); userInfoAdmin.setTodayOrder(todayOrder); userInfoAdmin.setMonthOrder(monthOrder); + + // 鏈鍙栫孩鍖� 寰呭叆璐﹂噾棰� + BigDecimal unaccountedMoney = hongBaoV2CountService.countWillGetMoneyByUid(uid); + if (unaccountedMoney == null) { + unaccountedMoney = new BigDecimal(0); + } + userInfoAdmin.setUnaccountedMoney(unaccountedMoney.toString()); + + // 鍘嗗彶鎬绘敹鐩� + BigDecimal totalMoneyHistory = hongBaoV2CountService.countMoneyByUidAndState(uid, 3); + if (totalMoneyHistory == null) { + totalMoneyHistory = new BigDecimal(0); + } + userInfoAdmin.setTotalMoneyHistory(totalMoneyHistory.toString()); // 鏀粯瀹濊处鍙� 绱杞处鎬婚噾棰� double totalMoney = payInfoMapper.sumMoneyByUid(uid); @@ -712,14 +734,6 @@ // 绱鎻愮幇 (鏆傛湭璁″叆寰俊) userInfoAdmin.setTotalExtract(totalMoney); - - // 鏈鍙栫孩鍖� 寰呭叆璐﹂噾棰� - double unaccountedMoney = hongBaoService.countForecastMoneysByUid(uid); - userInfoAdmin.setUnaccountedMoney(unaccountedMoney); - - // 鍘嗗彶鎬绘敹鐩� - double totalMoneyHistory = hongBaoService.countReceiveMoneysByUid(uid); - userInfoAdmin.setTotalMoneyHistory(totalMoneyHistory); // 缁熻鍒嗕韩涓暟 long countUserShares = userShareGoodsHistoryMapper.countUserShares(uid); @@ -797,4 +811,16 @@ return userInfoMapper.longTimeNoLogin(daysNum, list); } + /** + * 鏍规嵁鐢佃瘽鍙风爜銆侀個璇风爜鑾峰彇閭�璇风敤鎴� + * + * @param phone + * @param inviteCode + * @return + */ + @Override + public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) { + return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode); + } + } -- Gitblit v1.8.0