From c8041ec0544bf122e6819e6bf698997ccbf30aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 10 十二月 2019 15:32:34 +0800
Subject: [PATCH] 小黄条
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 138 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 31 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 eabd256..70d6918 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
@@ -2,10 +2,10 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
-import java.text.ParseException;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -13,11 +13,11 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.DateUtil;
import org.yeshi.utils.HttpUtil;
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;
@@ -26,11 +26,10 @@
import com.yeshi.fanli.dto.pdd.PDDPromotionUrl;
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinNewbies;
import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
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;
@@ -435,7 +434,6 @@
extraVO.setH5Url(h5Url);
}
- String tips = null;
String helpLink = null;
boolean fanliValid = true;
boolean shareValid = true;
@@ -500,24 +498,12 @@
otherInfo.setReduceHongBao(newUserHongBao);
goodsDetail.setOtherInfo(otherInfo);
- tips = "浣犱笉鏄�滄柊鐢ㄦ埛鈥濇棤娉曚娇鐢ㄦ柊浜虹孩鍖�0鍏冭喘涔般��";
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && userInfoExtra.getFirstLoginTime() != null) {
- try {
- int days = DateUtil.daysBetween2(userInfoExtra.getFirstLoginTime(), new Date());
- if (days < Constant.TLJ_NEW_USER_DEFINE){
- UserTaoLiJinNewbies winDetail = userTaoLiJinNewbiesService.selectByPrimaryKey(uid);
- if (winDetail == null || winDetail.getEndTime().getTime() < java.lang.System.currentTimeMillis()
- || winDetail.getMoney().compareTo(couponPrice) < 0) {
- tips = "鏂颁汉绾㈠寘涓嶈冻锛岃鎹釜鍟嗗搧鍐嶈瘯鎴栫户缁鍙栧埌瓒抽鏂颁汉绾㈠寘銆�";
- } else {
- tips = null;
- }
- }
- } catch (ParseException e) {
- e.printStackTrace();
- }
- }
+ // 涓撳睘鏍囩
+ List<ClientTextStyleVO> labels = new ArrayList<ClientTextStyleVO>();
+ labels.add(new ClientTextStyleVO("鏂颁汉涓撳睘", "#FE0014"));
+ labels.add(new ClientTextStyleVO("瀹炰粯0鍏�", "#FF9600"));
+ goodsDetail.setLabels(labels);
+
} else {// 鏅�氳喘涔�
OtherInfo otherInfo = new OtherInfo();
RewardCouponVO rewardCoupon = new RewardCouponVO();
@@ -539,7 +525,6 @@
}
extraVO.setFanliValid(fanliValid);
extraVO.setShareValid(shareValid);
- extraVO.setTips(tips);
MoneyInfoVO goodsMoney = goodsDetail.getMoneyInfo();
if (goodsMoney != null) {
@@ -635,14 +620,14 @@
jdGoods.setCommissionPlus(threeClass.getSelfComm());
// plus杩斿埄
BigDecimal fanliMoneyPlus = JDUtil.getGoodsFanLiMoneyPlus(jdGoods, fanLiRate);
- otherInfo.setFanliMoneyPlus("浜笢plus浼氬憳杩斅�" + fanliMoneyPlus);
+ otherInfo.setFanliMoneyPlus("浜笢plus杩斅�" + fanliMoneyPlus);
// 浣跨敤濂栧姳鍒告渶楂樿繑
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
maxMoneyPlus = "锛堜含涓減lus杩斅�"
+ fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
+ "锛�";
} else
- maxMoneyPlus = "锛堜含涓減lus浼氬憳鏈�楂樿繑楼"
+ maxMoneyPlus = "锛堜含涓減lus鏈�楂樿繑楼"
+ fanliMoneyPlus.add(MoneyBigDecimalUtil.mul(fanliMoneyPlus, Constant.MAX_REWARD_RATE))
+ "锛�";
}
@@ -673,7 +658,8 @@
if (couponInfo != null) {
// 鍒搁摼鎺ュ鐞�
String materialId = "https://item.jd.com/" + id + ".html";
- String url = JDApiUtil.convertLink(materialId, couponInfo.getLink(), JDApiUtil.POSITION_COUPON + "", null);
+ String url = JDApiUtil.convertLinkWithSubUnionId(materialId, couponInfo.getLink(),
+ JDApiUtil.POSITION_COUPON + "", null);
couponInfo.setLink(url);
}
@@ -1148,9 +1134,11 @@
if (couponInfo != null) {
couponUrl = couponInfo.getLink();
}
- jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + "");
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
} else {
- jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", uid + "");
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "",
+ uid + "");
}
JSONObject data = new JSONObject();
@@ -1176,7 +1164,7 @@
String jumpLink = null;
String materialId = "https://item.jd.com/" + id + ".html";
- jumpLink = JDApiUtil.convertLink(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", null + "");
+ jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, JDApiUtil.POSITION_FANLI + "", null);
JSONObject data = new JSONObject();
data.put("native", true);
@@ -1285,4 +1273,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_JD,
+ 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_PDD,
+ 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