From 52bc8ff0de3c7538d1401423c1cba9615c0c2082 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 18 六月 2020 17:22:24 +0800
Subject: [PATCH] 发圈商品来源修改 + 云发单规则调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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..b524cb4 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;
@@ -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);
--
Gitblit v1.8.0