From b8bac885abbc5506784e62831e7f75e184544324 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 10 一月 2019 16:05:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 928 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 779 insertions(+), 149 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 9aac2cc..5dd306b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -15,6 +14,10 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.IPUtil;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -22,6 +25,8 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SuperSpecial;
+import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
+import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
@@ -32,50 +37,62 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;
-import com.yeshi.fanli.entity.bus.user.CollectionGoods;
import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.bus.user.ShamUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.common.ImageInfo;
import com.yeshi.fanli.entity.common.JumpDetail;
+import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.goods.ScanHistoryV2;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
-import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.exception.goods.CommonGoodsException;
+import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.JumpDetailService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
-import com.yeshi.fanli.service.inter.goods.HonestService;
+import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
+import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
+import com.yeshi.fanli.service.inter.homemodule.SpecialService;
import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.user.ScanHistoryService;
+import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -83,13 +100,11 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.Utils;
+import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.IPUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -120,7 +135,7 @@
private OrderService orderService;
@Resource
- private ScanHistoryService scanHistoryService;
+ private ScanHistoryV2Service scanHistoryV2Service;
@Resource
private ShareManageService shareManageService;
@@ -147,10 +162,7 @@
private SystemConfigService systemConfigService;
@Resource
- private HonestService honestService;
-
- @Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@@ -184,6 +196,27 @@
@Resource
private SuperRecommendBannerV2Service superRecommendBannerV2Service;
+
+ @Resource
+ private ShamUserService shamUserService;
+
+ @Resource
+ private SpecialService specialService;
+
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private MonitorService monitorService;
+
+ @Resource
+ private CommonGoodsService commonGoodsService;
+
+ @Resource
+ private UserGoodsStorageService userGoodsStorageService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -227,10 +260,7 @@
JSONObject validData = null;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- String fcRate = convertMap.get("hongbao_fc_ratio");
-
+ BigDecimal proportion = manageService.getFanLiRate();
Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
for (int i = 0; i < size; i++) {
validData = new JSONObject();
@@ -253,7 +283,7 @@
JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
- proportion, fcRate, ""));
+ proportion.toString(), ""));
obj.put("taoBaoGoodsBrief", json);
array.add(obj);
}
@@ -274,7 +304,7 @@
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- List<Honest> honestList = honestService.getHonestListCache();
+ List<Honest> honestList = null;
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
@@ -502,15 +532,13 @@
}
}
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
JSONArray array = new JSONArray();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");
array.add(gson.toJson(taoBaoGoodsBriefExtra));
}
JSONObject data = new JSONObject();
@@ -599,18 +627,58 @@
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
- // TaoBaoGoodsBrief alimama = TaoBaoUtil.isAlimama(id);
+ // 鑾峰彇娣樺鍙傛暟
+ ClientTBPid clientTBPid = null;
+ // 鐢ㄦ埛宸茬粡鐧诲綍
+ if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {
+ TBPid tbPid = null;
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+ tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
+ if (tbPid != null) {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ } else {
+ clientTBPid = tbPidService.getAndroidDefault();
+ }
+
+ } else {
+ tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
+ if (tbPid != null) {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ } else {
+ clientTBPid = tbPidService.getIOSDefault();
+ }
+ }
+ } else {
+ if (acceptData.getPlatform().equalsIgnoreCase("android"))
+ clientTBPid = tbPidService.getAndroidDefault();
+ else
+ clientTBPid = tbPidService.getIOSDefault();
+ }
+
TaoBaoGoodsBrief tb = null;
try {
- tb = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ TaoKeAppInfo app = new TaoKeAppInfo();
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(clientTBPid.getSiteId());
+ app.setAdzoneId(clientTBPid.getAdZoneId());
+ app.setAppKey(clientTBPid.getAppKey());
+ app.setAppSecret(config.getAppSecret());
+ app.setPid(clientTBPid.getPid());
+ tb = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
} catch (NumberFormatException e1) {
e1.printStackTrace();
} catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+ return;
}
if (tb != null) {
- tb.setAuctionUrl(null);
+ // tb.setAuctionUrl(null);
tb.setId(null);
int type = 0;
if ("android".equalsIgnoreCase(acceptData.getPlatform()))
@@ -623,61 +691,35 @@
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
JSONObject data = new JSONObject();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0));
-
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
+ taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
+ taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
if (uid != null && !"".equals(uid.trim())) {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collection", collectionGoods != null ? true : false);
}
- // 鑾峰彇娣樺鍙傛暟
- ClientTBPid clientTBPid = null;
- // 鐢ㄦ埛宸茬粡鐧诲綍
- if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {
- TBPid tbPid = null;
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
- if (tbPid != null) {
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- } else {
- clientTBPid = tbPidService.getAndroidDefault();
- }
-
- } else {
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
- if (tbPid != null) {
-
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- } else {
- clientTBPid = tbPidService.getIOSDefault();
- }
- }
-
- if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
- taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(TaoBaoCouponUtil
- .getCoupleUrl(tb.getCouponActivityId(), tbPid.getPid(), tb.getAuctionId() + ""));
-
- } else {
- if (acceptData.getPlatform().equalsIgnoreCase("android"))
- clientTBPid = tbPidService.getAndroidDefault();
- else
- clientTBPid = tbPidService.getIOSDefault();
- }
-
data.put("tbPidInfo", clientTBPid);
- taoBaoGoodsBriefExtra.setAuctionUrl(null);
- data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
+ JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));
+ if (taoBaoGoodsBriefExtra.getImgList() != null)
+ taoBaoGoodsBriefExtra.getImgList().add(0, taoBaoGoodsBriefExtra.getPictUrl());
+ taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());
+ taobaoJson.put("saleCount", taoBaoGoodsBriefExtra.getSalesCount());// 閿�閲忥紙鍜宻alesCount涓�鑷达紝姝ゅ澶勭悊鍏煎锛�
+ if (taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
+ taobaoJson.put("coupon", true);
+ else
+ taobaoJson.put("coupon", false);
+
+ // taoBaoGoodsBriefExtra.setAuctionUrl(null);
+ data.put("taobao", taobaoJson);
String info = configService.get("detail_prompt");
data.put("info", info);
String onlyInfo = configService.get("only_info");
data.put("only", onlyInfo);
+ data.put("helpUrl", configService.get("old_goods_detail_help_url"));
+
int showType = taoBaoGoodsBriefExtra.getShowType();
String price = "";
if (showType == 1 || showType == 3) {
@@ -701,21 +743,16 @@
data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb) + "鍏�");
+ data.put("shareHongBao", "楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb));
+
out.print(JsonUtil.loadTrueResult(data));
final TaoBaoGoodsBrief tbb = tb;
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
-
- ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);
- sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
- sh.setCreatetime(new Date());
- if (uid != null && !uid.equals("")) {
- sh.setUid(Long.parseLong(uid));
- }
try {
- scanHistoryService.addScanHistory(sh);
+ scanHistoryV2Service.addScanHistory(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),
+ acceptData.getDevice(), tbb);
} catch (Exception e) {
e.printStackTrace();
}
@@ -737,7 +774,8 @@
// 鏂扮増鍟嗗搧鍥炬枃璇︽儏
@RequestMapping(value = "getnewgoodsdetail", method = RequestMethod.POST)
- public void getNewGoodsDetail(AcceptData acceptData, String id, String uid, PrintWriter out) {
+ public void getNewGoodsDetail(AcceptData acceptData, String id, String uid, HttpServletRequest request,
+ PrintWriter out) {
if ("0".equalsIgnoreCase(uid))
uid = "";
if (StringUtil.isNullOrEmpty(id)) {
@@ -834,12 +872,21 @@
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "鍟嗗搧涓嬫灦"));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
}
} else {
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
} catch (TaobaoGoodsDownException e) {
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0, 0, "鍟嗗搧涓嬫灦"));
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
@@ -921,8 +968,8 @@
goods.put("price", tb.getReservePrice().toString());
goods.put("zkPrice", tb.getZkPrice().toString());
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));
+ BigDecimal proportion = manageService.getFanLiRate();
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
goods.put("hongBao", hongBao);
// 30澶╅攢閲�
@@ -939,7 +986,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collected", collectionGoods != null ? true : false);
} else
@@ -1008,25 +1055,17 @@
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
- ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);
- sh.setId(0);
- sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
- sh.setCreatetime(new Date());
- if (!StringUtil.isNullOrEmpty(tempUid)) {
- sh.setUid(Long.parseLong(tempUid));
- }
try {
- scanHistoryService.addScanHistory(sh);
- } catch (Exception e) {
+ scanHistoryV2Service.addScanHistory(
+ StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),
+ goodsInfo);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
e.printStackTrace();
}
-
- // try {
- // taoBaoGoodsBriefService.updateTBGoodsWithNewInfo(goodsInfo);
- // } catch (Exception e) {
- //
- // }
}
});
}
@@ -1131,7 +1170,9 @@
if (goods == null)// 鍟嗗搧涓嬬嚎
{
// 浠庢垜浠殑鍟嗗搧搴撴悳绱�
- CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);
+ CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
+ CommonGoods.GOODS_TYPE_TB);
+
if (cgoods != null) {// 鍟嗗搧鏈夋湰鍦扮紦瀛�
// 鎸夊悕瀛楁悳绱㈠晢鍝�
SearchFilter sf = new SearchFilter();
@@ -1178,18 +1219,13 @@
List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (recommendGoodsList != null)
for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) {
if (taoBaoGoodsBrief == null)
continue;
- if (taoBaoGoodsBrief.getBiz30day() != null)
- taoBaoGoodsBrief.setSalesCount(0 + "");
- else
- taoBaoGoodsBrief.setSalesCount(TaoBaoUtil.getSaleCount(taoBaoGoodsBrief.getBiz30day()));
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
+
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re)));
}
@@ -1254,25 +1290,21 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
- boolean b = NumberUtil.isNumeric(uid);
- long id = 0;
- if (b) {
- id = Long.parseLong(uid);
- }
- List<ScanHistory> list = scanHistoryService.getScanHistory(sys.getId(), acceptData.getDevice(), page, 20, id);
- long count = scanHistoryService.getScanHistoryCount(sys.getId(), acceptData.getDevice(), id);
+ List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice());
JSONObject data = new JSONObject();
data.put("count", count);
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getApiCommonGson();
if (list != null) {
Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
- for (ScanHistory sh : list) {
- sh.setSalesCount(TaoBaoUtil.getSaleCount(sh.getBiz30day()));
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.getTaoBaoGoodsBrief(sh),
- proportion, fcRate, "")));
+ BigDecimal proportion = manageService.getFanLiRate();
+ for (ScanHistoryV2 sh : list) {
+ TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
+ goods.setId(sh.getId());
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
}
}
data.put("data", array);
@@ -1289,18 +1321,16 @@
return;
}
- long id = 0;
- if (NumberUtil.isNumeric(uid)) {
- id = Long.parseLong(uid);
- }
-
if ("0".equals(type)) {
String[] idStr = ids.split(",");
for (String auctionIdStr : idStr) {
- scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, Long.parseLong(auctionIdStr), id);
+ scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
+ Long.parseLong(auctionIdStr));
}
} else {
- scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, id);
+ scanHistoryV2Service.deleteByDeviceOrUid(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),
+ acceptData.getDevice());
}
out.print(JsonUtil.loadTrueResult(""));
@@ -1333,16 +1363,18 @@
/**
* 闃叉璇锋眰棰戠巼杩囬珮
+ *
*/
- String key = "linkParse-" + acceptData.getDevice() + "-" + id;
+ if (Constant.IS_OUTNET) {
+ String key = "linkParse-" + acceptData.getDevice() + "-" + id;
- String value = redisManager.getCommonString(key);
- if (!StringUtil.isNullOrEmpty(value)) {
- out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
- return;
+ String value = redisManager.getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(value)) {
+ out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
+ return;
+ }
+ redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
}
- redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
-
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
@@ -1372,7 +1404,8 @@
* -IOS鐨刬dfa骞垮憡鏍囪瘑淇℃伅
*/
@RequestMapping(value = "guessLikeByDevice")
- public void guessUserLikeByDevice(AcceptData acceptData, String imei, String idfa, int page, PrintWriter out) {
+ public void guessUserLikeByDevice(AcceptData acceptData, String imei, String idfa, int page,
+ HttpServletRequest request, PrintWriter out) {
int pageSize = Constant.PAGE_SIZE;
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
@@ -1380,12 +1413,11 @@
if (page <= 1) {
array.clear();
Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
long startTime = java.lang.System.currentTimeMillis();
+
TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);
- LogHelper.test("棣栭〉涓轰綘鎺ㄨ崘锛堟窐瀹濓級鍔犺浇鏃堕棿:" + (java.lang.System.currentTimeMillis() - startTime));
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
// 绛涢��
@@ -1397,27 +1429,39 @@
&& goods.getBiz30day() > 1000)
goodsList.add(goods);
}
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
+ (int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size()));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
Collections.shuffle(goodsList);
goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;
for (TaoBaoGoodsBrief goods : goodsList) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "")));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
+ }
+ } else {
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
+ (int) (java.lang.System.currentTimeMillis() - startTime), "鏃犳帹鑽�"));
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
- JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion,
- fcRate);
+ JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,
+ proportion.toString());
array.addAll(localArray);
} else {// 浠庣簿閫夊簱鏉�
Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
- array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);
+ BigDecimal proportion = manageService.getFanLiRate();
+ array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
return;
}
- long count = qualityGoodsService.countRecommendToIndex(proportion);
+ long count = qualityGoodsService.countRecommendToIndex(proportion.toString());
}
JSONObject data = new JSONObject();
@@ -1532,4 +1576,590 @@
out.print(JsonUtil.loadTrueResult(root));
}
+ /**
+ * 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.4.0)
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getNewRecommendInfo")
+ public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {
+
+ System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ List<SwiperPicture> listswiper = null;
+ if (!StringUtil.isNullOrEmpty(specialCard)) {
+ try {
+
+ listswiper = swiperPictureService.getByBannerCard(swiperCard);
+
+ if (listswiper != null && listswiper.size() > 0) {
+ for (SwiperPicture swiperPicture : listswiper) {
+ swiperPicture.setBannerId(null);
+ swiperPicture.setCreatetime(null);
+ swiperPicture.setUpdatetime(null);
+ swiperPicture.setState(null);
+ swiperPicture.setRemark(null);
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ Special miaoShaSpecial = null;
+ List<Special> honestList = new ArrayList<Special>();
+ List<Special> specialList = new ArrayList<Special>();
+
+ if (!StringUtil.isNullOrEmpty(specialCard)) {
+ try {
+ List<Special> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());
+
+ if (listSpecial != null && listSpecial.size() > 0) {
+ for (Special special : listSpecial) {
+ special.setCreatetime(null);
+ special.setUpdatetime(null);
+ special.setState(null);
+ special.setRemark(null);
+ special.setCard(null);
+ special.setCardId(null);
+
+ if ("闄愭椂绉掓潃".equals(special.getName())) {
+ miaoShaSpecial = special;
+ continue;
+ }
+
+ if ("arc".equals(special.getShowType())) {
+ // 鍚屼竴琛屼笓棰�
+ honestList.add(special);
+ } else {
+ // 鍏朵粬涓撻
+ specialList.add(special);
+ }
+ }
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ /* 闄愭椂绉掓潃 - 鏃堕棿澶勭悊 */
+ JSONObject msJSON = JSONObject.fromObject(new Gson().toJson(miaoShaSpecial));
+ if (miaoShaSpecial != null) {
+ // 鑾峰彇绉掓潃
+ int[] hours = new int[] { 0, 9, 12, 14, 16, 20, 22 };
+ int hour = -1;
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(Long.parseLong(acceptData.getTime()));
+ int nowHour = calendar.get(Calendar.HOUR_OF_DAY);
+ for (int i = 0; i < hours.length - 1; i++) {
+ if (nowHour >= hours[i] && nowHour < hours[i + 1]) {
+ hour = hours[i + 1];
+ break;
+ }
+ }
+
+ if (hour < 0)
+ hour = 24;
+ long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),
+ "yyyy-MM-dd") + 1000 * 60 * 60 * hour;
+ msJSON.put("time", time);
+ }
+
+ JSONObject root = new JSONObject();
+ root.put("banner", listswiper);
+ root.put("honest", honestList);
+ root.put("special", specialList);
+ root.put("miaoSha", msJSON);
+
+ // 澧炲姞閭�璇锋湁濂�
+ JSONObject invite = new JSONObject();
+ JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");
+ invite.put("jumpDetail", jumpDetail);
+ invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");
+
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
+ } else {
+
+ // 鎸夌収鐗堟湰杩斿洖锛岀増鏈鐩栬冻澶熷悗鍙垹闄�
+ if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)
+ || ("ios".equalsIgnoreCase(acceptData.getPlatform())
+ && Integer.parseInt(acceptData.getVersion()) > 37)) {
+ root.put("invite", invite);
+ }
+ }
+
+ out.print(JsonUtil.loadTrueResult(root));
+
+ }
+
+ /**
+ * 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
+ *
+ * @param acceptData
+ * @param id
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
+ public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {
+
+ if ("0".equalsIgnoreCase(uid)) {
+ uid = "";
+ }
+
+ if (StringUtil.isNullOrEmpty(id)) {
+ out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
+ return;
+ }
+
+ System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("invalid", false);
+
+ // IOS鏄惁姝ｅ湪涓婄嚎
+ if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
+ String version = acceptData.getVersion();
+ data.put("iosOnling", configService.iosOnLining(Integer.parseInt(version)));
+ }
+
+ long startTime = java.lang.System.currentTimeMillis();
+
+ // 鑾峰彇娣樺鍙傛暟
+ ClientTBPid clientTBPid = null;
+
+ if (StringUtil.isNullOrEmpty(uid)) {
+ // 鐢ㄦ埛鏈櫥褰�
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+ clientTBPid = tbPidService.getAndroidDefault();
+ } else {
+ clientTBPid = tbPidService.getIOSDefault();
+ }
+
+ } else {
+
+ // 鐢ㄦ埛宸茬粡鐧诲綍
+ TBPid tbPid = null;
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+
+ tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
+
+ if (tbPid == null) {
+ clientTBPid = tbPidService.getAndroidDefault();
+ } else {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ }
+
+ } else {
+
+ tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
+
+ if (tbPid == null) {
+ clientTBPid = tbPidService.getIOSDefault();
+ } else {
+ String siteId = tbPid.getPid().split("_")[2];
+ String adzoneId = tbPid.getPid().split("_")[3];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
+ clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
+ }
+ }
+ }
+
+ LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
+
+ final String clientPid = clientTBPid.getPid();
+ final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
+ // 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
+ boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
+
+ List<String> taskList = new ArrayList<>();
+ // 鑾峰彇鍟嗗搧鍩烘湰淇℃伅
+ taskList.add("goods");
+
+ taskList.stream().parallel().forEach(task -> {
+ if (task.equalsIgnoreCase("goods")) {
+ JSONObject ticket = new JSONObject();
+ TaoBaoGoodsBrief goods = null;
+
+ if (!convertInServer) {
+
+ try {
+ goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ } catch (TaobaoGoodsDownException e) {
+ // 鍟嗗搧涓嬫灦
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ }
+ });
+
+ }
+
+ } else {
+ String appId = clientPid.split("_")[2];
+ TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(appId);
+ TaoKeAppInfo app = new TaoKeAppInfo();
+ app.setAdzoneId(clientPid.split("_")[3]);
+ app.setAppKey(config.getAppKey());
+ app.setAppSecret(config.getAppSecret());
+ app.setPid(clientPid);
+
+ try {
+ goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
+ if (goods != null) {
+ ticket.put("clickUrl", goods.getAuctionUrl());
+ // 娴嬭瘯浣跨敤
+ ticket.put("couponUrl", goods.getCouponLink());
+ data.put("ticket", ticket);
+ }
+
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (TaobaoGoodsDownException e) {
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ }
+ });
+ }
+
+ }
+
+ if (goods != null) {
+ goodsList.add(goods);
+ final TaoBaoGoodsBrief newGoods = goods;
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ try {
+ // 鏇存柊鍟嗗搧
+ LogHelper.test("鏇存柊鍟嗗搧璇︽儏:" + newGoods.getAuctionId());
+ taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods);
+ } catch (TaobaoGoodsUpdateException e) {
+
+ }
+ }
+ });
+ }
+ }
+ });
+
+ TaoBaoGoodsBrief tb = null;
+ if (goodsList.size() > 0) {
+ tb = goodsList.get(0);
+ }
+
+ if (tb == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (tb.getImgList() == null) {
+ tb.setImgList(new ArrayList<>());
+ }
+
+ tb.getImgList().add(0, tb.getPictUrl());
+
+ List<String> finalImgList = new ArrayList<>();
+ for (String img : tb.getImgList()) {
+ finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
+ }
+
+ JSONObject goods = new JSONObject();
+ goods.put("auctionId", tb.getAuctionId());
+ goods.put("imgList", finalImgList);
+ goods.put("title", tb.getTitle());
+ goods.put("userType", tb.getUserType() == 1 ? 2 : 1);
+ goods.put("price", tb.getReservePrice().toString());
+ goods.put("zkPrice", tb.getZkPrice().toString());
+
+ // 绾㈠寘
+ BigDecimal proportion = manageService.getFanLiRate();
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ goods.put("hongBao", hongBao);
+ // 30澶╅攢閲�
+ goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
+
+ // 鍒嗕韩璧�
+ BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
+ data.put("shareMoney", "楼" + shareMoney);
+ // 鍒嗕韩璧氫汉鎻愮ず
+ List<ShamUser> listShareUser = new ArrayList<ShamUser>();
+ if (tb.getBiz30day() >= 1000) {
+ listShareUser = shamUserService.listRandShareUser(10, shareMoney, 1, 5);
+ }
+
+ // 鍒ゆ柇鏀惰棌
+ if (StringUtil.isNullOrEmpty(uid)) {
+ data.put("collected", false);
+ } else {
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
+ Long.parseLong(id));
+ data.put("collected", collectionGoods != null ? true : false);
+ }
+
+ // 娴嬭瘯
+ SystemClientParams params = systemClientParamsService.getSystemClientParamsBySystemAndKey(system,
+ "goods_detail_jump_taobao");
+ if ("1".equalsIgnoreCase((params.getValue() + "").trim())) {
+ data.put("native", true);
+ } else {
+ data.put("native", false);
+ }
+
+ // 鑾峰彇PID
+ String pid = clientTBPid.getPid();
+ LogHelper.test(String.format("PID: uid-%s pid-%s", uid + "", pid));
+
+ // 鏄惁鏈夊埜
+ goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);
+
+ // 棰嗗埜浜哄垪琛�
+ List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
+
+ // 鑾峰彇鍒镐俊鎭�
+ if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
+ BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
+ JSONObject couponInfo = new JSONObject();
+ couponInfo.put("couponPrice", quanPrice.toString());
+
+ // 鏈嶅姟绔浆閾�
+ if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+ couponInfo.put("couponUrl", tb.getCouponLink());
+ } else {
+ couponInfo.put("couponUrl",
+ TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + ""));
+ }
+
+ couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
+ couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ + tb.getCouponEffectiveEndTime().replace("-", "."));
+ goods.put("couponInfo", couponInfo);
+
+ if (tb.getBiz30day() >= 1000) {
+ // 棰嗗埜浜哄垪琛�
+ listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
+ }
+ }
+
+ data.put("tbPidInfo", clientTBPid);
+
+ String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();
+
+ if (!StringUtil.isNullOrEmpty(tb.getCouponActivityId())) {// 鏈夊埜锛岃烦杞埜閾炬帴
+ jumpUrl = TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId(), clientTBPid.getPid(),
+ "" + tb.getAuctionId());
+ }
+
+ // 璁剧疆璺宠浆閾炬帴
+ if (convertInServer) {
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink()))
+ jumpUrl = tb.getCouponLink();
+ else
+ jumpUrl = tb.getAuctionUrl();
+ }
+ goods.put("jumpUrl", jumpUrl);
+
+ TaoBaoShopInfo tbShopInfo = redisManager.getTBShopInfo(tb.getShopTitle(), tb.getSellerId(), tb.getAuctionId());
+ if (tbShopInfo != null) {
+ String shopType = tbShopInfo.getShopType();
+ if (!StringUtil.isNullOrEmpty(shopType) && shopType.contains("tm.png")) {
+ tbShopInfo.setUserType("1");
+ } else {
+ tbShopInfo.setUserType("0");
+ }
+ }
+ // 搴楅摵
+ goods.put("shopInfo", tbShopInfo);
+
+ // 鍒嗕韩璺緞
+ String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
+
+ // 鏄惁鍔犲叆閫夊搧搴擄細 0鏈姞鍏� 1 宸插姞鍏�
+ boolean storageState = false;
+ if (uid != null && uid.trim().length() > 0) {
+ storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));
+ }
+
+ data.put("storageState", storageState);
+ data.put("shareUrl", shareUrl);
+ data.put("goods", goods);
+ data.put("shareUsers", listShareUser);
+ data.put("couponUsers", listCouponUser);
+ data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id="+id);
+
+ out.print(JsonUtil.loadTrueResult(data));
+
+ final String tempUid = uid;
+ final TaoBaoGoodsBrief goodsInfo = tb;
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ // 娣诲姞娴忚璁板綍
+ try {
+ scanHistoryV2Service.addScanHistory(
+ StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),
+ goodsInfo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍥炬枃璇︽儏(1.4.0)
+ *
+ * @param acceptData
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "getgoodsdetailimgs", method = RequestMethod.POST)
+ public void getgoodsdetailimgs(AcceptData acceptData, String id, PrintWriter out) {
+
+ if (StringUtil.isNullOrEmpty(id)) {
+ out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
+ return;
+ }
+
+ List<String> detailImgs = new ArrayList<>();
+ JSONArray detailImgsSize = new JSONArray();
+
+ List<ImageInfo> imgs = redisManager.getTaoBaoGoodsDetailImgs(Long.parseLong(id));
+
+ if (imgs != null && imgs.size() > 0) {
+
+ for (ImageInfo imgInfo : imgs) {
+ detailImgs.add(imgInfo.getPicture());
+ }
+
+ for (ImageInfo imgInfo : imgs) {
+
+ if (imgInfo.getWidth() <= 0) {
+ detailImgsSize.clear();
+ break;
+ }
+
+ JSONObject size = new JSONObject();
+ size.put("w", imgInfo.getWidth());
+ size.put("h", imgInfo.getHeight());
+ detailImgsSize.add(size);
+ }
+
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("detailImgs", detailImgs);
+ data.put("detailImgsSize", detailImgsSize);
+
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+ /**
+ * 鍟嗗搧璇︽儏鎺ㄨ崘1.4.0
+ *
+ * @param acceptData
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
+ public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
+
+ System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
+ // 鍒濆鍖�
+ if (goodsList == null) {
+ goodsList = new ArrayList<TaoBaoGoodsBrief>();
+ }
+
+ BigDecimal proportion = manageService.getFanLiRate();
+
+ List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
+
+ goodsList.parallelStream().forEach(goods -> {
+ // 鑾峰彇璇︽儏
+ TaoBaoGoodsBrief taoBaoGoodsBrief = null;
+ try {
+ taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goods.getAuctionId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ if (taoBaoGoodsBrief != null) {
+ listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
+ }
+
+ });
+
+ List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
+
+ try {
+ List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);
+
+ if (listRecommend != null && listRecommend.size() > 1) {
+ for (QualityFactory quality : listRecommend) {
+
+ TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
+ if (taoBaoGoodsBrief == null) {
+ continue;
+ }
+
+ int biz30day = taoBaoGoodsBrief.getBiz30day();
+ if (biz30day >= 10000) {
+ double sales = biz30day;
+ String salesCountMidea = String.format("%.1f", sales / 10000);
+ taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
+ } else {
+ taoBaoGoodsBrief.setSalesCount(biz30day + "");
+ }
+
+ // 鏀瑰彉鍥剧墖灏哄
+ String pictUrl = taoBaoGoodsBrief.getPictUrl();
+ if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
+ taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
+ }
+
+ listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
+ }
+ }
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+
+ // 鍙栧伓鏁颁釜鏁版嵁
+ if (listExtra.size() % 2 != 0) {
+ listExtra.remove(listExtra.size() - 1);
+ }
+
+ if (listQuality.size() % 2 != 0) {
+ listQuality.remove(listQuality.size() - 1);
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra));
+ data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality));
+
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0