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 | 8 +++-----
1 files changed, 3 insertions(+), 5 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 83c6462..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
@@ -31,7 +31,6 @@
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemService;
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;
@@ -94,8 +93,7 @@
@Resource
private SystemService systemService;
- @Resource
- private HongBaoMessageService hongBaoMessageService;
+
@Resource
private ShamUserService shamUserService;
@@ -154,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) {
@@ -178,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