From 8a54915d3c39d9d8d7e90c0971d1e19d0eb76622 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 12 六月 2020 14:37:04 +0800
Subject: [PATCH] 券统计
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 31 +++++++++++++++++++++----------
1 files changed, 21 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 2ab4cfa..73dbbbf 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
@@ -518,7 +518,6 @@
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()));
}
@@ -570,7 +569,11 @@
commonGoods.setState(2);
}
}
-
+
+ if (state != null && state == UserCloudGoods.STATE_INVALID) {
+ commonGoods.setState(1);
+ }
+
GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
detailVO.setId(commonGoods.getId());
@@ -636,18 +639,26 @@
* @param out
*/
@RequestMapping(value = "switchState")
- public void switchState(String callback, AcceptData acceptData, Long uid, Integer type, Boolean state,
+ public void switchState(String callback, AcceptData acceptData, Long uid, Integer type, Integer state,
PrintWriter out) {
- if (uid == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ if (uid == null || type == null || state == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鍙傛暟涓嶅畬鏁�"));
return;
}
- if (type == 1) {
- userCloudManageService.save(uid, state, null);
- } else {
- userCloudManageService.save(uid, null, state);
+
+ boolean reslut = false;
+ if (state == 1) {
+ reslut = true;
}
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+
+ if (type == 1) {
+ userCloudManageService.save(uid, reslut, null);
+ } else {
+ userCloudManageService.save(uid, null, reslut);
+ }
+ JSONObject data = new JSONObject();
+ data.put("state", reslut);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
/**
--
Gitblit v1.8.0