From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
index bd0bef6..8c6a765 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
@@ -35,7 +35,6 @@
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.cloud.UserCloudException;
import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
-import com.yeshi.fanli.exception.user.cloud.UserCloudOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.dynamic.GoodsEvaluateService;
@@ -54,6 +53,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.aitaoker.AitaokerApiUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.suning.SuningUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -244,7 +244,7 @@
}
// 鏁欑▼
- List<BannerVO> listBanner = swiperPictureService.getByBannerCard("cloud_course");
+ List<BannerVO> listBanner = swiperPictureService.getByBannerCard("cloud_course",acceptData.getSystem());
if (listBanner != null && listBanner.size() > 0) {
cloudInfoVO.setCourse(listBanner.get(0));
}
@@ -261,6 +261,7 @@
* @param uid
* @param out
*/
+ @RequestSerializableByKey(key = "'getQrcodeMaclogin-'+#uid")
@RequestMapping(value = "getQrcodeMaclogin")
public void getQrcodeMaclogin(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null) {
@@ -444,6 +445,12 @@
return;
}
+ UserCloud userCloud = userCloudService.getValidByUid(uid);
+ if (userCloud == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇峰厛寮�閫氫簯鍙戝崟"));
+ return;
+ }
+
try {
// 閲嶆柊鑾峰彇缇ゅ垪琛�
userCloudService.searchGroup(uid);
@@ -481,12 +488,20 @@
return;
}
+ UserCloud userCloud = userCloudService.getValidByUid(uid);
+ if (userCloud == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇峰厛寮�閫氫簯鍙戝崟"));
+ return;
+ }
+
boolean reslut = false;
if (state == 1) {
reslut = true;
}
try {
+
+
userCloudGroupService.switchGroupState(uid, id, reslut);
// 鑾峰彇鏈�鏂扮兢
List<UserCloudGroup> list = userCloudGroupService.listGroupByUid(uid);
@@ -566,7 +581,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion());
+ acceptData.getVersion(),acceptData.getSystem());
for (UserCloudGoods cloudGoods : list) {
CommonGoods commonGoods = cloudGoods.getCommonGoods();
@@ -710,7 +725,7 @@
key = StringUtil.Md5(key);
redisManager.cacheCommonString(key , builder.toString() , 60*10);
- String link = configService.get(ConfigKeyEnum.cloudAlipayJumpLink.getKey()) +"?key=%s";
+ String link = configService.getValue(ConfigKeyEnum.cloudAlipayJumpLink.getKey(),acceptData.getSystem()) +"?key=%s";
JSONObject dataObject = new JSONObject();
dataObject.put("link", String.format(link, key));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject));
@@ -769,7 +784,7 @@
} catch (UserCloudException e) {
if (e.getCode() > 1000 && e.getCode() < 1100) {
JSONObject data = new JSONObject();
- data.put("link", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ data.put("link", configService.getValue(ConfigKeyEnum.robotCloudLink.getKey(),acceptData.getSystem()));
JsonUtil.printMode(out, callback, JsonUtil.loadTrue(e.getCode(), data, e.getMsg()).toString());
} else {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
@@ -795,7 +810,7 @@
}
try {
- GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsId, goodsType);
+ GoodsEvaluate evaluate = goodsEvaluateService.queryExistSingle(goodsId, goodsType,acceptData.getSystem());
if (evaluate != null) {
userCloudService.sendByDynamic(uid, evaluate.getId());
} else {
@@ -815,7 +830,7 @@
} catch (UserCloudException e) {
if (e.getCode() > 1000 && e.getCode() < 1100) {
JSONObject data = new JSONObject();
- data.put("link", configService.get(ConfigKeyEnum.robotCloudLink.getKey()));
+ data.put("link", configService.getValue(ConfigKeyEnum.robotCloudLink.getKey(),acceptData.getSystem()));
JsonUtil.printMode(out, callback, JsonUtil.loadTrue(e.getCode(), data, e.getMsg()).toString());
} else {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getCode(),e.getMsg()));
--
Gitblit v1.8.0