From 32f8ab2806fb088335e24983477f5179064ada9d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 29 十一月 2019 17:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 99 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index b9623f6..17d190b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -4,7 +4,9 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -16,6 +18,7 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDCategoryInfo;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
@@ -28,6 +31,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDGoodsClass;
import com.yeshi.fanli.entity.system.BusinessSystem;
@@ -98,6 +102,7 @@
import com.yeshi.fanli.vo.tlj.ReduceHongBao;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
+import net.sf.json.JSON;
import net.sf.json.JSONObject;
@Controller
@@ -706,7 +711,8 @@
if (couponInfo != null) {
// 鍒搁摼鎺ュ鐞�
String materialId = "https://item.jd.com/" + id + ".html";
- String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(), JDApiUtil.POSITION_COUPON + "", null);
+ String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),
+ JDApiUtil.POSITION_COUPON + "", null);
couponInfo.setLink(url);
}
@@ -1181,9 +1187,11 @@
if (couponInfo != null) {
couponUrl = couponInfo.getLink();
}
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + "");
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
} else {
- jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + "");
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
}
JSONObject data = new JSONObject();
@@ -1318,4 +1326,92 @@
}
out.print(JsonUtil.loadTrueResult(data));
}
+
+ @RequestMapping(value = "listSimpleGoods", method = RequestMethod.POST)
+ public void listSimpleGoods(AcceptData acceptData, String goodsInfo, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(goodsInfo)) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧淇℃伅涓虹┖"));
+ return;
+ }
+
+ net.sf.json.JSONArray array = net.sf.json.JSONArray.fromObject(goodsInfo);
+
+ List<CommonGoods> commonGoodsList = new ArrayList<>();
+
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject obj = array.optJSONObject(i);
+ CommonGoods cg = new CommonGoods();
+ cg.setGoodsId(obj.optLong("goodsId"));
+ cg.setGoodsType(obj.optInt("goodsType"));
+ commonGoodsList.add(cg);
+ }
+
+ if (commonGoodsList.size() > 9) {
+ out.print(JsonUtil.loadFalseResult(1, "鏈�澶氬悓鏃惰幏鍙�9鏉℃暟鎹�"));
+ return;
+ }
+
+ // 鍒嗙鍚勪釜骞冲彴鐨勫晢鍝佷俊鎭�
+ List<Long> tbGoodsList = new ArrayList<>();
+ List<Long> jdGoodsList = new ArrayList<>();
+ List<Long> pddGoodsList = new ArrayList<>();
+
+ List<String> keyList = new ArrayList<>();
+
+ for (CommonGoods cg : commonGoodsList) {
+ keyList.add(cg.getGoodsId() + "-" + cg.getGoodsType());
+ if (cg.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ tbGoodsList.add(cg.getGoodsId());
+ } else if (cg.getGoodsType() == Constant.SOURCE_TYPE_JD) {
+ jdGoodsList.add(cg.getGoodsId());
+ } else if (cg.getGoodsType() == Constant.SOURCE_TYPE_PDD) {
+ pddGoodsList.add(cg.getGoodsId());
+ }
+ }
+
+ Map<String, GoodsDetailVO> tempGoodsList = new HashMap<>();
+
+ ConfigParamsDTO params = new ConfigParamsDTO(hongBaoManageService.getFanLiRate(),
+ hongBaoManageService.getShareRate(), new BigDecimal(80));
+
+ if (tbGoodsList.size() > 0) {
+ List<TaoBaoGoodsBrief> goodsList = null;
+ try {
+ goodsList = TaoKeApiUtil.getBatchGoodsInfo(tbGoodsList);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ } catch (TaoKeApiException e) {
+ e.printStackTrace();
+ }
+ if (goodsList != null)
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ goods.setTkRate(new BigDecimal(0));
+ tempGoodsList.put(goods.getAuctionId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+ GoodsDetailVOFactory.convertTaoBao(goods, params));
+ }
+ }
+ if (jdGoodsList.size() > 0) {
+ List<JDGoods> goodsList = JDApiUtil.getGoodsDetail(jdGoodsList);
+ for (JDGoods goods : goodsList) {
+ tempGoodsList.put(goods.getSkuId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+ GoodsDetailVOFactory.convertJDGoods(goods, params));
+ }
+ }
+ if (pddGoodsList.size() > 0) {
+ List<PDDGoodsDetail> goodsList = PinDuoDuoApiUtil.listGoodsDetail(pddGoodsList);
+ for (PDDGoodsDetail goods : goodsList) {
+ tempGoodsList.put(goods.getGoodsId() + "-" + Constant.SOURCE_TYPE_TAOBAO,
+ GoodsDetailVOFactory.convertPDDGoods(goods, params));
+ }
+ }
+ List<GoodsDetailVO> voList = new ArrayList<>();
+ Gson gson = JsonUtil.getApiCommonGson();
+ for (String key : keyList) {
+ GoodsDetailVO vo = tempGoodsList.get(key);
+ if (vo != null) {
+ voList.add(vo);
+ }
+ }
+ out.print(JsonUtil.loadTrueResult(gson.toJson(voList)));
+ }
}
--
Gitblit v1.8.0