From 3ff6731a55c21a982f0ba3fc95f0e9410e144ceb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 14:19:28 +0800
Subject: [PATCH] 删除AccountMessage多余信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 88 +++++++------------------------------------
1 files changed, 15 insertions(+), 73 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 10e9bab..aac326d 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
@@ -37,16 +37,14 @@
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.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.HongBaoV2;
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;
@@ -61,7 +59,7 @@
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;
@@ -73,8 +71,8 @@
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;
@@ -88,7 +86,6 @@
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;
@@ -99,7 +96,6 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
-import com.yeshi.fanli.service.inter.user.WxDownService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -134,9 +130,6 @@
private OrderService orderService;
@Resource
- private MoneyRecordService moneyRecordService;
-
- @Resource
private BindingAccountService bindingAccountService;
@Resource
@@ -149,7 +142,7 @@
private ConfigService configService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private ShamUserService shamUserService;
@@ -164,13 +157,7 @@
private LostOrderService lostOrderService;
@Resource
- private AccountMessageService accountMessageService;
-
- @Resource
private HongBaoManageService hongBaoManageService;
-
- @Resource
- private WxDownService wxDownService;
@Resource
private UserAccountService loginService;
@@ -217,6 +204,9 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
+ @Resource
+ private AccountMessageService accountMessageService;
+
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";
@@ -252,8 +242,6 @@
// 閭�璇峰叧绯荤敓鏁�
threeSaleSerivce.effective(find);
- // 閲嶆柊璁＄畻鐢ㄦ埛绛夌骇
- threeSaleSerivce.reComputeUserRank(id);
// 娣诲姞鐢ㄦ埛娲昏穬璁板綍
UserActiveLog userActiveLog = new UserActiveLog();
@@ -273,7 +261,8 @@
}
}
// 涓嶆槸鐢↖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;
@@ -459,7 +448,8 @@
}
}
// 涓嶆槸鐢↖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;
@@ -611,7 +601,6 @@
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
userInfoService.updateLoginInfo(uuser);
- wxDownService.save(device);
// 鏇存柊鐢ㄦ埛闄勫姞淇℃伅锛岃�佺敤鎴蜂笉瀛樺湪鐨勯渶瑕佹坊鍔�
try {
userInfoExtraService.updateUserRankByUid(uuser.getId());
@@ -713,42 +702,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));
}
/**
@@ -1150,7 +1103,8 @@
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("绯荤粺涓嶅瓨鍦�"));
@@ -1266,7 +1220,8 @@
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("绯荤粺涓嶅瓨鍦�"));
@@ -1736,19 +1691,6 @@
}
data.put("list", array);
data.put("count", count);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping(value = "isWxDown")
-
- public void isWxDown(AcceptData acceptData, PrintWriter out) {
- boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());
- // IOS涓婄嚎娴嬭瘯
- if (Integer.parseInt(acceptData.getVersion()) >= 22
- && acceptData.getPackages().equalsIgnoreCase(Constant.systemCommonConfig.getIosBundleId()))
- b = false;
- JSONObject data = new JSONObject();
- data.put("isFirst", b);
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0