From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index f848c65..3a0a886 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -18,16 +18,16 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.SystemFunction;
import com.yeshi.fanli.util.*;
+import com.yeshi.fanli.util.GsonUtil;
+import com.yeshi.fanli.util.StringUtil;
import org.apache.commons.beanutils.PropertyUtils;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.multipart.MultipartFile;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.IPUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.*;
import org.yeshi.utils.taobao.TbImgUtil;
import org.yeshi.utils.tencentcloud.COSManager;
@@ -70,8 +70,8 @@
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
@@ -324,7 +324,7 @@
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -515,7 +515,7 @@
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -1155,7 +1155,7 @@
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
LogHelper.userInfo("鎻愮幇鏃讹紝涓嶅瓨鍦ㄨ绯荤粺");
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
@@ -1502,7 +1502,7 @@
List<TaoBaoGoodsBrief> listTaoKeGoods = new ArrayList<TaoBaoGoodsBrief>();
if (collectionGoodsList != null && collectionGoodsList.size() > 0) {
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
List<Long> listGid = new ArrayList<Long>();
for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
@@ -2050,7 +2050,7 @@
public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
try {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
return;
@@ -2179,12 +2179,14 @@
data.put("welfareCenterNews", welfareCenterNews);// 绂忓埄涓績娑堟伅
data.put("vipLink", userVipConfigService.getValueByKey("vip_link"));// 瓒呯骇浼氬憳鍗囩骇閾炬帴
- // 2.0.1涔嬪悗缁戝畾鎵嬫満鍙�
- if (VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
- boolean bindPhone = false;
- if (StringUtil.isNullOrEmpty(userInfo.getPhone()))
- bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);
- data.put("bindPhone", bindPhone);
+ if(SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.bindPhone)) {
+ // 2.0.1涔嬪悗缁戝畾鎵嬫満鍙�
+ if (VersionUtil.greaterThan_2_0_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ boolean bindPhone = false;
+ if (StringUtil.isNullOrEmpty(userInfo.getPhone()))
+ bindPhone = bindRemindService.bindRemind(uid, BindRemind.TYPE_PHONE);
+ data.put("bindPhone", bindPhone);
+ }
}
if (!StringUtil.isNullOrEmpty(invitCode)) {
--
Gitblit v1.8.0