From b651fb598b4da4ffa734a372e8d1b0b01eeef3fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 16:10:19 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareStorageControllerV2.java | 186 ++++++++++++++++++++++------------------------
1 files changed, 88 insertions(+), 98 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 2e0536c..cf84f9d 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
@@ -54,22 +54,20 @@
@Resource
private UserGoodsStorageService userGoodsStorageService;
-
/**
* 鎵归噺娣诲姞閫夊搧搴�
*
* @param acceptData
- * @param uid
- * 鐢ㄦ埛id
- * @param ids
- * 绠�鐗堝晢鍝乮d
+ * @param uid 鐢ㄦ埛id
+ * @param ids 绠�鐗堝晢鍝乮d
* @param out
*/
@RequestMapping(value = "addStorage", method = RequestMethod.POST)
public void addStorage(AcceptData acceptData, Long uid, String ids, PrintWriter out) {
try {
Gson gson = new Gson();
- Set<Long> set = gson.fromJson(ids, new TypeToken<HashSet<Long>>() {}.getType());
+ Set<Long> set = gson.fromJson(ids, new TypeToken<HashSet<Long>>() {
+ }.getType());
if (set == null || set.size() == 0) {
out.print(JsonUtil.loadFalseResult("鏈�夋嫨鍟嗗搧"));
return;
@@ -79,11 +77,9 @@
out.print(JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
} catch (UserGoodsStorageException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
- }
+ }
}
-
-
/**
* 鏌ヨ鐢ㄦ埛閫夊搧搴撴暟鎹�
*
@@ -104,113 +100,107 @@
out.print(JsonUtil.loadFalseResult("骞冲彴绫诲瀷涓嶈兘涓虹┖"));
return;
}
-
+
if (page == null || page < 1) {
page = 1;
}
- try {
- int pageSize = Constant.PAGE_SIZE;
- JSONArray array = new JSONArray();
- JSONObject data = new JSONObject();
-
- if (goodsType == Constant.SOURCE_TYPE_JD) {
- String open = configService.get("share_jd_open");
- if (!"1".equals(open.trim())) {
- data.put("count", 0);
- data.put("result_list", array);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
- }
-
- List<UserGoodsStorage> listStorage = userGoodsStorageService.listQueryByUid((page - 1) * pageSize, pageSize,
- uid, goodsType);
- if (listStorage == null || listStorage.size() == 0) {
+ int pageSize = Constant.PAGE_SIZE;
+ JSONArray array = new JSONArray();
+ JSONObject data = new JSONObject();
+
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
+ String open = configService.get("share_jd_open");
+ if (!"1".equals(open.trim())) {
data.put("count", 0);
data.put("result_list", array);
out.print(JsonUtil.loadTrueResult(data));
return;
}
+ }
- // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
- List<TaoBaoGoodsBrief> listTaoKeGoods = null;
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
- List<Long> listGid = new ArrayList<Long>();
- for (UserGoodsStorage userGoodsStorage : listStorage) {
- CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
- if (commonGoods == null) {
- continue;
- }
- listGid.add(commonGoods.getGoodsId());
- }
+ List<UserGoodsStorage> listStorage = userGoodsStorageService.listQueryByUid((page - 1) * pageSize, pageSize,
+ uid, goodsType);
+ if (listStorage == null || listStorage.size() == 0) {
+ data.put("count", 0);
+ data.put("result_list", array);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
- try {
- listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);
- } catch (TaoKeApiException e) {
- e.printStackTrace();
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
- BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
- BigDecimal shareRate = hongBaoManageService.getShareRate();
-
+ // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
+ List<TaoBaoGoodsBrief> listTaoKeGoods = null;
+ if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ List<Long> listGid = new ArrayList<Long>();
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
if (commonGoods == null) {
continue;
}
-
- // 娣樺疂鍟嗗搧楠岃瘉鍦ㄥ敭
- if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
- if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
- int state = 1; // 榛樿鍋滃敭
- Long goodsId = commonGoods.getGoodsId();
- for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
- if (goodsId == auctionId || goodsId.equals(auctionId)) {
- state = 0; // 鍦ㄥ敭
- break;
- }
- }
- commonGoods.setState(state);
- }
- }
-
- // 鍒ゆ柇鏄惁宸插垎浜紝 宸插垎浜樉绀哄凡涓嬫灦
- Integer storageState = userGoodsStorage.getState();
- if (storageState != null && storageState == UserGoodsStorage.STATE_SHARED) {
- Integer goodsState = commonGoods.getState();
- if (goodsState != null && goodsState != 1) {
- commonGoods.setState(2);
- }
- }
-
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
- detailVO.setId(commonGoods.getId());
-
-
- JSONObject dataObject = new JSONObject();
- dataObject.put("storageId", userGoodsStorage.getId());
- dataObject.put("goods", gson.toJson(detailVO));
- array.add(dataObject);
+ listGid.add(commonGoods.getGoodsId());
}
- long count = userGoodsStorageService.countQueryByUid(uid, goodsType);
- data.put("count", count);
- data.put("result_list", array);
- out.print(JsonUtil.loadTrueResult(data));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鍔犺浇鍒楄〃澶辫触"));
- e.printStackTrace();
+ try {
+ listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);
+ } catch (TaoKeApiException e) {
+ e.printStackTrace();
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
+
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+
+ for (UserGoodsStorage userGoodsStorage : listStorage) {
+ CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
+ if (commonGoods == null) {
+ continue;
+ }
+
+ // 娣樺疂鍟嗗搧楠岃瘉鍦ㄥ敭
+ if (goodsType == Constant.SOURCE_TYPE_TAOBAO) {
+ if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
+ int state = 1; // 榛樿鍋滃敭
+ Long goodsId = commonGoods.getGoodsId();
+ for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
+ Long auctionId = taoKeGoods.getAuctionId();
+ if (goodsId == auctionId || goodsId.equals(auctionId)) {
+ state = 0; // 鍦ㄥ敭
+ break;
+ }
+ }
+ commonGoods.setState(state);
+ }
+ }
+
+ // 鍒ゆ柇鏄惁宸插垎浜紝 宸插垎浜樉绀哄凡涓嬫灦
+ Integer storageState = userGoodsStorage.getState();
+ if (storageState != null && storageState == UserGoodsStorage.STATE_SHARED) {
+ Integer goodsState = commonGoods.getState();
+ if (goodsState != null && goodsState != 1) {
+ commonGoods.setState(2);
+ }
+ }
+
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
+ detailVO.setId(commonGoods.getId());
+
+ JSONObject dataObject = new JSONObject();
+ dataObject.put("storageId", userGoodsStorage.getId());
+ dataObject.put("goods", gson.toJson(detailVO));
+ array.add(dataObject);
+ }
+
+ long count = userGoodsStorageService.countQueryByUid(uid, goodsType);
+ data.put("count", count);
+ data.put("result_list", array);
+ out.print(JsonUtil.loadTrueResult(data));
}
-
+
}
--
Gitblit v1.8.0