From 8b37d2f16d4aa7c7ce19829b74307ae0072b127f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 二月 2019 10:44:55 +0800
Subject: [PATCH] 1.5.1 奖励券、免单券
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 67 insertions(+), 18 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
index 8fba11d..49ecb5b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.encrypt.DESUtil;
import com.alipay.api.AlipayApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -44,9 +45,11 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
+import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -74,7 +77,7 @@
@Resource
private HongBaoService hongBaoService;
-
+
@Resource
private HongBaoV2Service hongBaoV2Service;
@@ -129,6 +132,12 @@
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+ @Resource
+ private SpreadUserImgService spreadUserImgService;
+
+ @Resource
+ private UserShareGoodsRecordService userShareGoodsRecordService;
+
private static final String PASSWORD_MAX_ERROR = "password_max_error";
private static final String EXTRACT_MIN_MONEY = "extract_min_money";
private static final String EXTRACT_MAX_MONEY = "extract_max_money";
@@ -143,12 +152,13 @@
* @param tbOpenid
* @param tbNickName
* @param tbPortrait
+ * @param tbSession(娣樺疂session鏁版嵁,鍔犲瘑)
* @param out
*/
@RequestMapping(value = "login")
public void login(AcceptData acceptData, String code, String vcode, String phone, boolean wxinstall,
- String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,
- HttpServletRequest request, PrintWriter out) {
+ String tbOpenid, String tbNickName, String tbPortrait, String tbSession, int loginType, Boolean first,
+ HttpSession session, HttpServletRequest request, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -164,6 +174,19 @@
}
redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);
+ }
+
+ if (!StringUtil.isNullOrEmpty(tbSession)) {
+ try {
+ tbSession = DESUtil.decode(tbSession.replace("\n", ""), StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ JSONObject tbs = JSONObject.fromObject(tbSession);
+ tbOpenid = tbs.optString("openId");
+ tbNickName = tbs.optString("nick");
+ tbPortrait = tbs.optString("avatarUrl");
}
UserInfo tbUserInfo = new UserInfo();
@@ -445,16 +468,31 @@
* @param tbOpenid
* @param tbNickName
* @param tbPortrait
+ * @param tbSession
+ * -娣樺疂鎺堟潈session
* @param out
*/
@RequestMapping(value = "bindTaoBao")
public void bindTaoBao(AcceptData acceptData, Long uid, String tbOpenid, String tbNickName, String tbPortrait,
- PrintWriter out) {
+ String tbSession, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
+ }
+
+ if (!StringUtil.isNullOrEmpty(tbSession)) {
+ try {
+ tbSession = DESUtil.decode(tbSession.replace("\n", ""), StringUtil.getBase64String("YeShiFANLI889*+"),
+ StringUtil.getBase64String("*M#34f?,"));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ JSONObject session = JSONObject.fromObject(tbSession);
+ tbOpenid = session.optString("openId");
+ tbNickName = session.optString("nick");
+ tbPortrait = session.optString("avatarUrl");
}
try {
@@ -839,6 +877,7 @@
*/
@RequestMapping(value = "getusermoney")
public void getMoneyDetail(AcceptData acceptData, Long uid, PrintWriter out) {
+
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
if (user == null) {
out.print(JsonUtil.loadFalseResult(2, "鐢ㄦ埛涓嶅瓨鍦�"));
@@ -857,29 +896,39 @@
BigDecimal unOpenmoney = hongBaoV2Service.getUnRecievedFanLiMoney(uid);
BigDecimal totalFanMoney = hongBaoV2Service.getTotalFanLiMoney(uid);
JSONObject data = new JSONObject();
+ int spreadImgCount = spreadUserImgService.countUserSpreadImg(uid);
+ long shareCount = userShareGoodsRecordService.countShareRecordByUid(uid);
+
// IOS绔暟瀛楁寜鐓у瓧绗︿覆澶勭悊
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 33) {
data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("moneyLastMonth", moneyLastMonth.toString());
- data.put("money", user.getMyHongBao().toString());
- data.put("unGetMoney", unOpenmoney.toString());
- data.put("totalFanLiMoney", totalFanMoney.toString());// 绱杩斿埄
- data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid).toString());// 绱鎻愭垚
- data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid).toString()); // 鏈埌璐︽彁鎴�
+ data.put("moneyLastMonth", moneyLastMonth.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ data.put("money", user.getMyHongBao().setScale(2, BigDecimal.ROUND_DOWN).toString());
+ data.put("unGetMoney", unOpenmoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ data.put("totalFanLiMoney", totalFanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());// 绱杩斿埄
+ data.put("totalTiChengMoney",
+ hongBaoV2Service.getTotalTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString());// 绱鎻愭垚
+ data.put("totalUnGetTiChengMoney",
+ hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN).toString()); // 鏈埌璐︽彁鎴�
// 灞曠ず鎻愭垚鏁版嵁
- data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);
+ if (configService.iosOnLining(Integer.parseInt(acceptData.getVersion())))
+ data.put("showTiCheng", false);
+ else
+ data.put("showTiCheng", spreadImgCount + shareCount > 0);
} else {
data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));
data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));
- data.put("moneyLastMonth", moneyLastMonth);
- data.put("money", user.getMyHongBao());
- data.put("unGetMoney", unOpenmoney);
- data.put("totalFanLiMoney", totalFanMoney);// 绱杩斿埄
- data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid));// 绱鎻愭垚
- data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid)); // 鏈埌璐︽彁鎴�
+ data.put("moneyLastMonth", moneyLastMonth.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("money", user.getMyHongBao().setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("unGetMoney", unOpenmoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("totalFanLiMoney", totalFanMoney.setScale(2, BigDecimal.ROUND_DOWN));// 绱杩斿埄
+ data.put("totalTiChengMoney",
+ hongBaoV2Service.getTotalTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN));// 绱鎻愭垚
+ data.put("totalUnGetTiChengMoney",
+ hongBaoV2Service.getUnGetTiChengMoney(uid).setScale(2, BigDecimal.ROUND_DOWN)); // 鏈埌璐︽彁鎴�
// 灞曠ず鎻愭垚鏁版嵁
- data.put("showTiCheng", hongBaoV2Service.getTotalTiChengCount(uid) > 0);
+ data.put("showTiCheng", spreadImgCount + shareCount > 0);
}
user.setNoOpenHongBao(unOpenmoney);
--
Gitblit v1.8.0