From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java | 73 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
index f2218ca..b9de58b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java
@@ -17,6 +17,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
import com.yeshi.fanli.entity.goods.CommonGoods;
@@ -26,10 +27,11 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.UserGoodsStorageException;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
@@ -56,10 +58,8 @@
@Resource
private UserGoodsStorageService userGoodsStorageService;
-
-
/**
- * 鍗曚釜鍟嗗搧鍔犲叆閫夊搧搴�
+ * 鍗曚釜鍟嗗搧鍔犲叆閫夊搧搴�
*
* @param callback
* @param storageIds
@@ -67,22 +67,17 @@
* @param out
*/
@RequestMapping(value = "accordtorage", method = RequestMethod.POST)
- public void accordtorage(AcceptData acceptData, Long uid, Long id, Integer goodsType, PrintWriter out) {
+ public void accordtorage(AcceptData acceptData, Long uid, long id, Integer goodsType, PrintWriter out) {
- if (id == null) {
- out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
- return;
- }
-
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (goodsType == null) {
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
try {
UserGoodsStorage userGoodsStorage = userGoodsStorageService.getByUidAndAuctionId(uid, id, goodsType);
boolean storageState = false;
@@ -96,23 +91,24 @@
userGoodsStorageService.save(uid, set, goodsType);
storageState = true;
}
-
+
JSONObject data = new JSONObject();
data.put("storageState", storageState);
out.print(JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
-
+
/**
* 鎵归噺娣诲姞閫夊搧搴�
*
* @param acceptData
- * @param uid 鐢ㄦ埛id
- * @param ids 绠�鐗堝晢鍝乮d
+ * @param uid
+ * 鐢ㄦ埛id
+ * @param ids
+ * 绠�鐗堝晢鍝乮d
* @param out
*/
@RequestMapping(value = "addStorage", method = RequestMethod.POST)
@@ -137,8 +133,10 @@
* 鏌ヨ鐢ㄦ埛閫夊搧搴撴暟鎹�
*
* @param acceptData
- * @param page 椤电爜 鍒濆鍊� 1
- * @param uid 鐢ㄦ埛id
+ * @param page
+ * 椤电爜 鍒濆鍊� 1
+ * @param uid
+ * 鐢ㄦ埛id
* @param out
*/
@RequestMapping(value = "getlist", method = RequestMethod.POST)
@@ -209,6 +207,7 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
@@ -241,7 +240,7 @@
}
}
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
detailVO.setId(commonGoods.getId());
JSONObject dataObject = new JSONObject();
@@ -256,7 +255,6 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* 鍒嗕韩鍟嗗搧杩斿洖浜岀淮鐮佸浘鐗�
*
@@ -272,7 +270,7 @@
out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"));
return;
}
-
+
if (uid == null) {
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
@@ -280,19 +278,28 @@
try {
Gson gson = new Gson();
- List<Long> listStorageID = gson.fromJson(storageIds, new TypeToken<ArrayList<Long>>() {}.getType());
- if (listStorageID == null || listStorageID.size() < 9) {
- out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻"));
- return;
- }
-
- if (listStorageID.size() != 9) {
- out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺鍙兘鏄�9涓�"));
- return;
+ List<Long> listStorageID = gson.fromJson(storageIds, new TypeToken<ArrayList<Long>>() {
+ }.getType());
+
+ if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+
+ if (listStorageID == null || listStorageID.size() < 9) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻"));
+ return;
+ }
+
+ if (listStorageID.size() != 9) {
+ out.print(JsonUtil.loadFalseResult("鍒嗕韩鍟嗗搧鏁伴噺鍙兘鏄�9涓�"));
+ return;
+ }
+
+ JSONObject data = userGoodsStorageService.createShareV2(uid, listStorageID, true);
+ out.print(JsonUtil.loadTrueResult(data));
+ } else {
+ JSONObject data = userGoodsStorageService.createShareV2(uid, listStorageID, false);
+ out.print(JsonUtil.loadTrueResult(data));
}
- JSONObject data = userGoodsStorageService.createShareV2(uid, listStorageID);
- out.print(JsonUtil.loadTrueResult(data));
} catch (UserGoodsStorageException e) {
out.print(JsonUtil.loadFalseResult("鍒嗕韩澶辫触"));
e.printStackTrace();
--
Gitblit v1.8.0