From 6a04b2680d414714ce922f7d694224ff65202c67 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 18 十二月 2018 10:21:22 +0800
Subject: [PATCH] 删除HongBaoMessage相关代码
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java | 17 ++++-------------
1 files changed, 4 insertions(+), 13 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 cc5a8d1..2dda1aa 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
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.alipay.api.AlipayApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
@@ -29,9 +30,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
@@ -49,13 +48,11 @@
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.WxDownService;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -96,8 +93,7 @@
@Resource
private SystemService systemService;
- @Resource
- private HongBaoMessageService hongBaoMessageService;
+
@Resource
private ShamUserService shamUserService;
@@ -118,12 +114,7 @@
private AccountMessageService accountMessageService;
@Resource
- private CollectionGoodsService collectionGoodsService;
- @Resource
private HongBaoManageService hongBaoManageService;
-
- @Resource
- private WxDownService wxDownService;
@Resource
private UserAccountService userAccountService;
@@ -161,7 +152,7 @@
*/
@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,
+ String tbOpenid, String tbNickName, String tbPortrait, int loginType, Boolean first, HttpSession session,HttpServletRequest request,
PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
@@ -185,7 +176,7 @@
tbUserInfo.setTbName(tbNickName);
tbUserInfo.setTbPic(tbPortrait);
try {
- LoginResult result = userAccountService.login(session, first, system.getAppid(), code, phone, tbUserInfo,
+ LoginResult result = userAccountService.login(request, first, system.getAppid(), code, phone, tbUserInfo,
wxinstall, loginType);
if (result == null)
LogHelper.error("login-result涓虹┖鍊�");
--
Gitblit v1.8.0