From 1340beb67a9b6d777821d0139bcc7c9b0896ed4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 10:59:26 +0800
Subject: [PATCH] 拼多多比价修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 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 e435224..ed951c8 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
@@ -13,8 +13,10 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemFunction;
import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.vo.taobao.TaoBaoUser;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -51,33 +53,18 @@
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
-import com.yeshi.fanli.service.inter.money.UserMoneyService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
-import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;
-import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
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.push.DeviceTokenXMService;
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;
-import com.yeshi.fanli.service.inter.user.TBPidService;
-import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
-import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
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.invite.UserInviteService;
@@ -92,7 +79,8 @@
import com.yeshi.fanli.vo.user.UserVipRateVO;
import net.sf.json.JSONObject;
-import org.yeshi.utils.SystemUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import org.yeshi.utils.TimeUtil;
import org.yeshi.utils.entity.ProxyIP;
/**
@@ -289,6 +277,47 @@
}
}
+
+ /**
+ * 娣樺疂鐧诲綍锛堝瓙APP锛�
+ *
+ * @param acceptData
+ * @param userData
+ * @param request
+ * @param out
+ */
+ @RequestMapping(value = "loginTB", method = RequestMethod.POST)
+ public void loginTB(AcceptData acceptData, String userData,
+ HttpServletRequest request, PrintWriter out) {
+ if (acceptData.getSystem() == SystemEnum.blks) {
+ out.print(JsonUtil.loadFalseResult("鏆備笉鏀寔姝ょ鐧诲綍鏂瑰紡"));
+ return;
+ }
+ TaoBaoUser taoBaoUser = new Gson().fromJson(userData, TaoBaoUser.class);
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages(), acceptData.getSystem());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ UserInfo userInfo = null;
+ try {
+ userInfo = userAccountService.loginTB(new ProxyIP(request.getRemoteHost(), request.getRemotePort()), taoBaoUser, system);
+ } catch (UserAccountException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ }
+
+ if (userInfo == null) {
+ out.print(JsonUtil.loadFalseResult("鐧诲綍澶辫触"));
+ } else {
+ JSONObject data = new JSONObject();
+ data.put("userInfo", UserUtil.filterForClientUser(userInfo));
+ data.put("inviteCode", userInfoExtraService.getInviteCodeByUid(userInfo.getId()));
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+ }
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
--
Gitblit v1.8.0