From 251a533b9c12e7d423b31473721a59580cab5b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 25 七月 2020 13:07:13 +0800
Subject: [PATCH] 将商品服务剥离出主项目
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 c9f4db5..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;
@@ -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