From 2d3afb55aed07f9780ab46aefbdc7d520cdff576 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 26 十一月 2019 15:44:22 +0800
Subject: [PATCH] 品牌排序
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 154 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 136 insertions(+), 18 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 7d230fa..9d1c062 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
@@ -1,6 +1,9 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -13,11 +16,15 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
import com.yeshi.fanli.entity.push.DeviceActive;
+import com.yeshi.fanli.entity.shop.BanLiShopOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -25,8 +32,11 @@
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
+import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
+import com.yeshi.fanli.service.inter.user.BindRemindService;
import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
@@ -38,12 +48,14 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
@@ -93,6 +105,9 @@
private DeviceTokenOPPOService deviceTokenOPPOService;
@Resource
+ private DeviceTokenVIVOService deviceTokenVIVOService;
+
+ @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@Resource
@@ -128,8 +143,24 @@
@Resource
private DeviceActiveService deviceActiveService;
+ @Resource
+ private BindRemindService bindRemindService;
+
+ @Resource
+ private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
+
+ @Resource
+ private IntegralDetailService integralDetailService;
+
+ @Resource
+ private BanLiShopOrderService banLiShopOrderService;
-
+ @Resource
+ private ConfigService configService;
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -143,7 +174,7 @@
* @param out
*/
@RequestMapping(value = "login", method = RequestMethod.POST)
- public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,
+ public void login(AcceptData acceptData, int loginType, String vcode, String phone, String code,
HttpServletRequest request, PrintWriter out) {
try {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
@@ -182,19 +213,11 @@
LogHelper.errorDetailInfo(e);
}
- if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
- /* 鏂颁汉绾㈠寘 */
- try {
- userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- // 缁戝畾oppo鎺ㄩ��
+ // 缁戝畾oppo,VIVO鎺ㄩ��
DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
if (active != null) {
deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
}
}
});
@@ -217,7 +240,7 @@
e1.printStackTrace();
}
}
-
+
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鐧诲綍澶辫触"));
try {
@@ -228,8 +251,6 @@
}
}
-
-
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
@@ -240,7 +261,8 @@
*/
@RequestSerializableByKey(key = "'bindPhoneLogin-'+#phone")
@RequestMapping(value = "bindPhoneLogin")
- public void bindPhoneLogin(AcceptData acceptData,String vcode, String phone, String key, HttpServletRequest request, PrintWriter out) {
+ public void bindPhoneLogin(AcceptData acceptData, String vcode, String phone, String key,
+ HttpServletRequest request, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
acceptData.getPackages());
if (system == null) {
@@ -262,7 +284,7 @@
out.print(JsonUtil.loadFalseResult("key鍊间笉鑳戒负绌�"));
return;
}
-
+
phone = phone.replaceAll(" ", "");
String oldVCode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_BIND);
@@ -286,5 +308,101 @@
out.print(JsonUtil.loadFalseResult(1, "缁戝畾澶辫触"));
}
}
+
+ /**
+ * 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
+ *
+ * @param acceptData
+ * @param vcode
+ * @param phone
+ * @param out
+ */
+ @RequestMapping(value = "recordBind")
+ public void recordBind(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
+ return;
+ }
+
+ bindRemindService.addBindPhone(uid);
+ out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
+ }
+
+ /**
+ * 鑾峰彇vip淇℃伅
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getVIPInfo")
+ public void getVIPInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
+ return;
+ }
+
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ out.print(JsonUtil.loadFalseResult("璇ョ敤鎴蜂笉瀛樺湪"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("id", uid);
+ data.put("nickName", userInfo.getNickName());
+ data.put("portrait", userInfo.getPortrait());
+
+ UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
+ boolean vip = false;
+ if (userVIPInfo != null && userVIPInfo.getState() != null
+ && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) {
+ vip = true;
+ data.put("applyTime", userVIPInfo.getSuccessTime());
+ }
+ data.put("vip", vip);
+
+ // 鐪侀挶 -鑷喘浜х敓杩斿埄
+ BigDecimal rewardPurchase = hongBaoV2CountService.getRewardMoneyBySelf(uid);
+ data.put("rurchaseReward", rewardPurchase.setScale(2));
+
+ BigDecimal conserveMoney = rewardPurchase;
+ if (!vip) { // 灏戠渷閽憋細 鑷喘浜х敓杩斿埄 * 5/12
+ BigDecimal rate1 = new BigDecimal(5);
+ BigDecimal rate2 = new BigDecimal(12);
+ conserveMoney = MoneyBigDecimalUtil.mul2(rewardPurchase, MoneyBigDecimalUtil.div(rate1, rate2));
+ }
+ data.put("conserveMoney", conserveMoney.setScale(2));
+
+ // 鍒嗕韩璧�
+ BigDecimal rewardShare = hongBaoV2CountService.getRewardMoneyByShare(uid);
+ // 閭�璇疯禋
+ BigDecimal rewardInvite = hongBaoV2CountService.getRewardMoneyByInvite(uid);
+
+ BigDecimal earnMoney = rewardShare;
+ if (vip) { // 璧氶挶=鍒嗕韩+閭�璇�
+ earnMoney = MoneyBigDecimalUtil.add(rewardShare, rewardInvite );
+ } else { // 灏戣禋閽憋細 鍒嗕韩璧�* 5/12
+ BigDecimal rate1 = new BigDecimal(5);
+ BigDecimal rate2 = new BigDecimal(12);
+ earnMoney = MoneyBigDecimalUtil.mul2(rewardShare, MoneyBigDecimalUtil.div(rate1, rate2));
+ }
+ data.put("earnMoney", earnMoney.setScale(2));
+
+ // 娉細1.鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬1鍏冿紙閫�娆句负澶辨晥锛夛紱
+ long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, "2019-01-01", new BigDecimal(1));
+ data.put("teamNum", teamNum);
+
+ // 绱閲戝竵
+ BigDecimal goldCoin = integralDetailService.getCumulativeMoney(uid);
+ data.put("goldCoin", goldCoin.setScale(0));
+ // 甯姪閾炬帴
+ data.put("helpLink", configService.get("help_link_vip_info"));
+
+ // 浣跨敤绾㈠寘娆℃暟
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(BanLiShopOrder.STATE_SUCCESS);
+ data.put("shopNum", banLiShopOrderService.countByUidAndState(uid, list));
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
--
Gitblit v1.8.0