From 1d2e2ee00ed42265fc0c45688d9040701543909f Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 11 六月 2020 17:50:21 +0800
Subject: [PATCH] 云发单调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 10 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 916074d..2ab4cfa 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
@@ -33,9 +33,6 @@
import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.taobao.TaoKeApiException;
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.cloud.UserCloudException;
import com.yeshi.fanli.exception.user.cloud.UserCloudGroupException;
import com.yeshi.fanli.log.LogHelper;
@@ -57,7 +54,6 @@
import com.yeshi.fanli.util.aitaoker.AitaokerApiUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.suning.SuningUtil;
-import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.user.cloud.CloudOrderMenuVO;
import com.yeshi.fanli.vo.user.cloud.UserCloudInfoVO;
@@ -396,7 +392,7 @@
* @param out
*/
@RequestMapping(value = "switchCircleState")
- public void switchCircleState(String callback, AcceptData acceptData, Long uid, Boolean state, PrintWriter out) {
+ public void switchCircleState(String callback, AcceptData acceptData, Long uid, Integer state, PrintWriter out) {
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -405,8 +401,14 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐘舵�佷笉鑳戒负绌�"));
return;
}
+
+ boolean reslut = false;
+ if (state == 1) {
+ reslut = true;
+ }
+
try {
- userCloudGroupService.switchCircleState(uid, state);
+ userCloudGroupService.switchCircleState(uid, reslut);
} catch (UserCloudGroupException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
}
@@ -455,7 +457,7 @@
* @param out
*/
@RequestMapping(value = "switchGroupState")
- public void switchGroupState(String callback, AcceptData acceptData, Long uid, Long id, Boolean state,
+ public void switchGroupState(String callback, AcceptData acceptData, Long uid, Long id, Integer state,
PrintWriter out) {
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -465,12 +467,61 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鍙傛暟涓嶈兘涓虹┖"));
return;
}
+
+ boolean reslut = false;
+ if (state == 1) {
+ reslut = true;
+ }
+
try {
- userCloudGroupService.switchGroupState(uid, id, state);
+ userCloudGroupService.switchGroupState(uid, id, reslut);
+ // 鑾峰彇鏈�鏂扮兢
+ List<UserCloudGroup> list = userCloudGroupService.listGroupByUid(uid);
+ if (list == null)
+ list = new ArrayList<>();
+
+ JSONObject data = new JSONObject();
+ data.put("listGroup", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (UserCloudGroupException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
}
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ }
+
+
+
+ /**
+ * 璁剧疆鐘舵��
+ *
+ * @param callback
+ * @param acceptData
+ * @param uid
+ * @param type
+ * @param out
+ */
+ @RequestMapping(value = "deleteGroup")
+ public void switchGroupState(String callback, AcceptData acceptData, Long uid, Long id,
+ PrintWriter out) {
+ if (uid == null || id == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鍙傛暟涓嶅畬鏁�"));
+ return;
+ }
+
+ try {
+ userCloudGroupService.deleteGroup(uid, id);
+
+ // 鑾峰彇鏈�鏂扮兢
+ List<UserCloudGroup> list = userCloudGroupService.listGroupByUid(uid);
+ if (list == null)
+ list = new ArrayList<>();
+
+ JSONObject data = new JSONObject();
+ data.put("listGroup", list);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (UserCloudGroupException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ }
}
/**
@@ -635,7 +686,7 @@
key = StringUtil.Md5(key);
redisManager.cacheCommonString(key , builder.toString() , 60*10);
- String link = configService.get(ConfigKeyEnum.cloudAlipayNotifyLink.getKey()) +"?key=%s";
+ String link = configService.get(ConfigKeyEnum.cloudAlipayJumpLink.getKey()) +"?key=%s";
JSONObject dataObject = new JSONObject();
dataObject.put("link", String.format(link, key));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject));
--
Gitblit v1.8.0