From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 179 ++++++++---------------------------------------------------
1 files changed, 26 insertions(+), 153 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index 7b55fae..bfef4cd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -34,25 +34,24 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
+import com.yeshi.fanli.dto.money.AccountDetails;
+import com.yeshi.fanli.dto.order.OrderItem;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.AccountMessage;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
-import com.yeshi.fanli.entity.bus.user.HongBao;
-import com.yeshi.fanli.entity.bus.user.HongBaoExtra;
import com.yeshi.fanli.entity.bus.user.LostOrder;
-import com.yeshi.fanli.entity.bus.user.MoneyRecord;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.PassWordErrorRecord;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
@@ -60,11 +59,10 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.order.HongBaoOrder;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.BindingAccountException;
-import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
@@ -73,23 +71,21 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.config.AppVersionService;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.config.SystemService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleExtraInfoSerivce;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
@@ -135,12 +131,6 @@
private OrderService orderService;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
- private MoneyRecordService moneyRecordService;
-
- @Resource
private BindingAccountService bindingAccountService;
@Resource
@@ -153,7 +143,7 @@
private ConfigService configService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private ShamUserService shamUserService;
@@ -166,9 +156,6 @@
@Resource
private LostOrderService lostOrderService;
-
- @Resource
- private OrderItemServcie orderItemServcie;
@Resource
private AccountMessageService accountMessageService;
@@ -221,6 +208,9 @@
@Resource
private AppVersionService appVersionService;
+ @Resource
+ private HongBaoV2CountService hongBaoV2CountService;
+
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";
@@ -256,8 +246,6 @@
// 閭�璇峰叧绯荤敓鏁�
threeSaleSerivce.effective(find);
- // 閲嶆柊璁＄畻鐢ㄦ埛绛夌骇
- threeSaleSerivce.reComputeUserRank(id);
// 娣诲姞鐢ㄦ埛娲昏穬璁板綍
UserActiveLog userActiveLog = new UserActiveLog();
@@ -277,7 +265,7 @@
}
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -463,7 +451,7 @@
}
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -502,10 +490,9 @@
}
private void outUserInfo(AcceptData acceptData, PrintWriter out, String remotIP, UserInfo user, String device) {
- BigDecimal MyTotalMoney = hongBaoService.getMyTotalHongBaoByUid(user.getId());
- user.setTotalHongBao(MyTotalMoney);
- BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());
- BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());
+ user.setTotalHongBao(new BigDecimal(0));
+ BigDecimal unOpenmoney = new BigDecimal(0);
+ BigDecimal canOpenMoney = new BigDecimal(0);
user.setNoOpenHongBao(unOpenmoney);
user.setCanOpenHongBao(canOpenMoney);
@@ -592,7 +579,15 @@
data.put("moduleState", mySettings);
+ int welfareCenterNews = 0;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
+ if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {
+ welfareCenterNews = userInfoExtra.getCouponNews();
+ }
+ data.put("welfareCenterNews", welfareCenterNews);
+
out.print(JsonUtil.loadTrueResult(data));
+
final UserInfo uuser = user;
ThreadUtil.run(new Runnable() {
public void run() {
@@ -710,98 +705,6 @@
}
userInfoService.unBindUserInfo(find, type);
out.print(JsonUtil.loadTrueResult("瑙ｇ粦鎴愬姛"));
- }
-
- /**
- * 鑾峰彇鎻愮幇璁板綍
- *
- * @param acceptData
- * @param uid
- * 鐢ㄦ埛id
- * @param page
- * 椤垫暟锛堜粠0寮�濮嬶級
- * @param out
- */
- @RequestMapping(value = "getmoneyrecord", method = RequestMethod.POST)
- public void getMoneyRecord(AcceptData acceptData, long uid, int page, PrintWriter out) {
- UserInfo user = userInfoService.getUserById(uid);
- if (user == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
- return;
- }
- if (page < 0) {
- page = 0;
- }
-
- List<MoneyRecord> moneyRecordList = moneyRecordService.getMoneyRecord(uid, page);
- int count = moneyRecordService.getCount(uid);
- JSONObject data = new JSONObject();
- if (moneyRecordList == null || moneyRecordList.size() == 0) {
- data.put("count", 0);
- data.put("moneyRecordList", new ArrayList());
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
- data.put("count", count);
- Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
- data.put("moneyRecordList", gson.toJson(moneyRecordList));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
- * 鑾峰彇褰撳墠鐢ㄦ埛绾㈠寘
- *
- * @param acceptData
- * @param uid
- * 鐢ㄦ埛id
- * @param out
- * @throws ObjectStateException
- */
- @RequestMapping(value = "gethongbao", method = RequestMethod.POST)
- public void getHongBao(AcceptData acceptData, long uid, PrintWriter out) {
- UserInfo user = userInfoService.getUserById(uid);
- JSONObject data = new JSONObject();
- if (user == null) {
- data.put("count", 0);
- data.put("hongBaoList", new ArrayList());
- data.put("error", "鐢ㄦ埛涓嶅瓨鍦�");
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
- List<HongBaoExtra> hongBaoList = hongBaoService.getHongBao(uid);
-
- if (hongBaoList.size() == 0) {
- data.put("count", 0);
- data.put("hongBaoList", hongBaoList);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
- data.put("count", hongBaoList.size());
- data.put("hongBaoList", GsonUtil.toJsonExpose(hongBaoList));
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
-
- /**
- * 璁剧疆鎻愮幇瀵嗙爜
- *
- * @param acceptData
- * @param payPassword
- * 鎻愮幇瀵嗙爜锛堣缁忚繃md5鍔犲瘑锛�
- * @param uid
- * 鐢ㄦ埛id
- * @param out
- */
- @RequestMapping(value = "setpaypassword", method = RequestMethod.POST)
- public void setPayPassword(AcceptData acceptData, String payPassword, long uid, PrintWriter out) {
- UserInfo user = userInfoService.getUserById(uid);
- if (user == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
- return;
- }
- user.setPayPassword(payPassword);
- userInfoService.update(user);
- out.print(JsonUtil.loadTrueResult("璁剧疆鎴愬姛"));
}
/**
@@ -1203,7 +1106,7 @@
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
LogHelper.userInfo("鎻愮幇鏃讹紝涓嶅瓨鍦ㄨ绯荤粺");
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -1319,7 +1222,7 @@
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
LogHelper.userInfo("鎻愮幇鏃讹紝涓嶅瓨鍦ㄨ绯荤粺");
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -1445,21 +1348,6 @@
out.print(JsonUtil.loadTrueResult(data));
}
- @RequestMapping(value = "openhongbao")
- public void openHongBao(AcceptData acceptData, long hid, HttpServletRequest request, PrintWriter out) {
- String ip = IPUtil.getRemotIP(request);
- HongBaoExtra hbx = hongBaoService.open(hid, ip);
- if (hbx == null) {
- out.print(JsonUtil.loadFalseResult("绾㈠寘寮傚父"));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "] 鎵撳紑绾㈠寘[id=" + hid + "]澶辫触锛�");
- return;
- }
- JSONObject data = new JSONObject();
- data.put("hongBao", GsonUtil.toJsonExpose(hbx));
- out.print(JsonUtil.loadTrueResult(data));
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "] 鎵撳紑绾㈠寘[id=" + hid + "]鎴愬姛锛�");
- }
-
@RequestMapping("findLostOrder")
public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, PrintWriter out) {
boolean orderNum = true;
@@ -1536,21 +1424,6 @@
JSONObject data = new JSONObject();
data.put("list", gson.toJson(orderItemList));
data.put("count", count);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping("getOrderItem")
- public void getOrderItem(AcceptData acceptData, long id, PrintWriter out) {
- OrderItem orderItem = orderItemServcie.getOne(id);
- if (orderItem == null) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ璁㈠崟"));
- return;
- }
- orderItem.setDesc();
- JSONObject data = new JSONObject();
- GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
- Gson gson = gsonBuilder.excludeFieldsWithoutExposeAnnotation().create();
- data.put("orderItem", gson.toJson(orderItem));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0