From e04f81915e100107eca5fe16ba44898f3a0dbd55 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 18:48:06 +0800
Subject: [PATCH] redis指定数据库
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 122 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 24 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index 94b2cdd..e530d7d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -6,6 +6,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -25,18 +26,17 @@
import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInviteValidNum;
-import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -51,7 +51,9 @@
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.LostOrderService;
+import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
@@ -88,13 +90,13 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.user.UserVipRateVO;
import net.sf.json.JSONObject;
+import org.yeshi.utils.entity.ProxyIP;
/**
* 璐︽埛绯荤粺
@@ -223,6 +225,14 @@
@Resource
private UserVIPPreInfoService userVIPPreInfoService;
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private OrderMoneyDailyCountService orderMoneyDailyCountService;
+
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -249,12 +259,12 @@
UserInfo userInfo = null;
// 鎵嬫満鐧诲綍
if (loginType == 1) {
- userInfo = userAccountService.loginPhone(request, loginType, vcode, phone, system.getAppid());
+ userInfo = userAccountService.loginPhone(new ProxyIP(request.getRemoteHost(),request.getRemotePort()),acceptData, loginType, vcode, phone, system.getAppid());
}
// 寰俊鐧诲綍
if (loginType == 2) {
- userInfo = userAccountService.loginWeiXinNew(request, acceptData, loginType, code, system.getAppid());
+ userInfo = userAccountService.loginWeiXinNew(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, loginType, code, system.getAppid());
}
if (userInfo == null) {
@@ -368,7 +378,7 @@
}
try {
- UserInfo userInfo = userAccountService.bindPhoneToLogin(phone, key, system.getAppid(), request);
+ UserInfo userInfo = userAccountService.bindPhoneToLogin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()),acceptData, phone, key);
JSONObject data = new JSONObject();
data.put("userInfo", UserUtil.filterForClientUser(userInfo));
@@ -380,14 +390,14 @@
}
}
-
/**
* 缁戝畾寰俊V2.1.3 鐢佃瘽鍙风爜 鐧诲綍
- *
* @param acceptData
- * @param vcode
- * @param phone
+ * @param uid
+ * @param code
+ * @param key
+ * @param request
* @param out
*/
@RequestSerializableByKey(key = "'bindWXLogin-'+#code")
@@ -412,7 +422,7 @@
}
try {
- UserInfo userInfo = userAccountService.bindWXToLogin(request, acceptData, code, system.getAppid(), key);
+ UserInfo userInfo = userAccountService.bindWXToLogin(new ProxyIP(request.getRemoteHost(),request.getRemotePort()), acceptData, code, system.getAppid(), key);
JSONObject data = new JSONObject();
data.put("userInfo", UserUtil.filterForClientUser(userInfo));
out.print(JsonUtil.loadTrueResult(data));
@@ -422,14 +432,11 @@
}
-
-
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
- *
* @param acceptData
- * @param vcode
- * @param phone
+ * @param uid
* @param out
*/
@RequestMapping(value = "recordBind")
@@ -438,7 +445,6 @@
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
return;
}
-
bindRemindService.addBindPhone(uid);
out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
}
@@ -471,7 +477,7 @@
vo.setNickName(userInfo.getNickName());
vo.setPortrait(userInfo.getPortrait());
vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
- vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+ vo.setCsdLink(configService.getValue(ConfigKeyEnum.customerServiceLink.getKey(),acceptData.getSystem()));
Date now = new Date();
Date start = new Date(0);
@@ -754,7 +760,7 @@
}
json.put("tearcherWX", tearcherWX);
json.put("tearcherTip", "鎴戞槸浣犵殑瀵煎笀锛屼负浣犲湪鐪佽禋杩囩▼涓В闅剧瓟鐤戯紝瀵逛綘涓�瀵逛竴杈呭锛屽�惧惉浣犵殑闇�姹傛�荤粨骞跺弽棣堢粰鏉挎牀蹇渷瀹樻柟杩愯惀鍥㈤槦锛屽揩鏉ユ坊鍔犳垜鍚с��");
- json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+ json.put("newerGongLue", configService.getValue(ConfigKeyEnum.newerGonglue.getKey(),acceptData.getSystem()));
// 宸插畬鎴�
json.put("doneOrder", doneOrder);
@@ -772,7 +778,7 @@
json.put("superVIP", jsonrRed3);
// 浜哄伐瀹㈡湇閾炬帴
- json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+ json.put("csdLink", configService.getValue(ConfigKeyEnum.customerServiceLink.getKey(),acceptData.getSystem()));
UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
String leftTime = "";
@@ -920,11 +926,79 @@
redisManager.clearSMSVCode(phone, SMSHistory.TYPE_REMVOE);
}
- UserInfo user = new UserInfo(uid);
- user.setState(UserInfo.STATE_DELETE);
- user.setStateDesc("鐢ㄦ埛涓诲姩娉ㄩ攢璐︽埛");
- userInfoService.updateByPrimaryKeySelective(user);
+ userAccountService.forbiddenUserAll(uid, "鐢ㄦ埛涓诲姩娉ㄩ攢璐︽埛");
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娉ㄩ攢鎴愬姛"));
}
+
+ /**
+ * 娉ㄩ攢璐︽埛鏁版嵁
+ * @param acceptData
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping("getAccountData")
+ public void getAccountData(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ UserInfo user = userInfoService.getUserById(uid);
+ if (user == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ Date minDate = null;
+ Date maxDate = null;
+ long timeStamp = System.currentTimeMillis();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(timeStamp);
+
+ // 鍏ㄩ儴鏈埌璐�
+ minDate = new Date(0);
+ maxDate = new Date(timeStamp);
+ BigDecimal totalMoney = hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate);
+ if (totalMoney == null)
+ totalMoney = BigDecimal.ZERO;
+ totalMoney = totalMoney.add(user.getMyHongBao());
+
+ // 鏈湀棰勪及
+ maxDate = new Date(timeStamp);
+ calendar = Calendar.getInstance();
+ minDate = new Date(TimeUtil.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ calendar.add(Calendar.MONTH, -1);
+ BigDecimal monthMoney = getMoney(orderMoneyDailyCountService.query(uid, minDate, maxDate));
+
+ // 涓婃湀棰勪及
+ maxDate = new Date(TimeUtil
+ .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ calendar.add(Calendar.MONTH, -1);
+ minDate = new Date(TimeUtil
+ .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ BigDecimal lastMoney = getMoney(orderMoneyDailyCountService.query(uid, minDate, maxDate));
+
+ JSONObject data = new JSONObject();
+ data.put("totalMoney", totalMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("monthMoney", monthMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("lastMoney", lastMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("link", configService.getValue(ConfigKeyEnum.accountLogoutProtocolLink.getKey(),acceptData.getSystem()));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+ private BigDecimal getMoney(List<OrderMoneyDailyCount> list) {
+ BigDecimal money = BigDecimal.ZERO;
+ BigDecimal hundred = BigDecimal.valueOf(100);
+ if (list != null && list.size() > 0) {
+ for (OrderMoneyDailyCount dailyCount : list) {
+ if (dailyCount.getIncome() != null)
+ money = money.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));
+ if (dailyCount.getIncomeTeam() != null)
+ money = money.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));
+ }
+ }
+ return money;
+ }
}
--
Gitblit v1.8.0