From 61215ce3f221573d0338e3c275f7e7f463e70aa9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 04 十二月 2018 17:46:27 +0800
Subject: [PATCH] 失效订单调整
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 583 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 361 insertions(+), 222 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 f8ef598..999c33c 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
@@ -9,26 +9,8 @@
import java.util.List;
import java.util.Map;
-
-
-
-
-
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-
-
-
-
-
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-
-
-
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,8 +18,6 @@
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;
@@ -46,6 +26,7 @@
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;
@@ -78,13 +59,16 @@
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
+import com.yeshi.fanli.goods.CollectionGoodsV2;
+import com.yeshi.fanli.goods.CommonGoods;
import com.yeshi.fanli.log.LogHelper;
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.CollectionGoodsV2Service;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.HonestService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
@@ -94,9 +78,12 @@
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;
@@ -111,10 +98,14 @@
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 net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user")
@@ -172,7 +163,7 @@
private HonestService honestService;
@Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@@ -206,10 +197,21 @@
@Resource
private SuperRecommendBannerV2Service superRecommendBannerV2Service;
-
+
@Resource
private ShamUserService shamUserService;
-
+
+ @Resource
+ private SpecialService specialService;
+
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
+ @Resource
+ private MonitorService monitorService;
+
+ @Resource
+ private CommonGoodsService commonGoodsService;
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -625,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()))
@@ -649,61 +691,25 @@
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);
+ // taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
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) {
@@ -726,6 +732,8 @@
+ taoBaoGoodsBriefExtra.getTitle() + shareSinaContent);
data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb) + "鍏�");
+
+ data.put("shareHongBao", "楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb));
out.print(JsonUtil.loadTrueResult(data));
final TaoBaoGoodsBrief tbb = tb;
@@ -763,7 +771,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)) {
@@ -860,12 +869,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() {
@@ -965,7 +983,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
@@ -1157,7 +1175,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();
@@ -1211,7 +1231,7 @@
for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) {
if (taoBaoGoodsBrief == null)
continue;
-
+
re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re)));
@@ -1395,7 +1415,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();
@@ -1408,7 +1429,6 @@
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) {
// 绛涢��
@@ -1420,11 +1440,24 @@
&& 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, "")));
+ }
+ } else {
+ try {
+ monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
+ (int) (java.lang.System.currentTimeMillis() - startTime), "鏃犳帹鑽�"));
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
@@ -1478,9 +1511,8 @@
RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
// 娣樼壒浠锋殏鏃朵慨鏀�
if (system.getId() == 7) {
- recommendBanner.getJumpDetail().setActivity(
- recommendBanner.getJumpDetail().getActivity()
- .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));
+ recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()
+ .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));
}
listBanner.add(recommendBanner);
@@ -1555,10 +1587,117 @@
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);
+
+ out.print(JsonUtil.loadTrueResult(root));
+
+ }
+
/**
* 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
+ *
* @param acceptData
* @param id
* @param uid
@@ -1566,25 +1705,25 @@
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {
-
- if ("0".equalsIgnoreCase(uid)){
+
+ 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();
@@ -1595,8 +1734,7 @@
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
-
-
+
if (StringUtil.isNullOrEmpty(uid)) {
// 鐢ㄦ埛鏈櫥褰�
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
@@ -1604,28 +1742,28 @@
} else {
clientTBPid = tbPidService.getIOSDefault();
}
-
+
} else {
-
+
// 鐢ㄦ埛宸茬粡鐧诲綍
TBPid tbPid = null;
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
-
- tbPid = tbPidService.getTBPid(Long.parseLong(uid),PidUser.TYPE_FANLI_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);
+ 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 {
@@ -1637,83 +1775,82 @@
}
}
- LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
+ 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.deleteTaoBaoGoods(Long.parseLong(id));
- }
- });
+ JSONObject ticket = new JSONObject();
+ TaoBaoGoodsBrief goods = null;
- }
-
- } 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);
- }
+ if (!convertInServer) {
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- }
-
- }
-
- if (goods != null) {
- goodsList.add(goods);
- final TaoBaoGoodsBrief newGoods = goods;
+ try {
+ goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ } catch (TaobaoGoodsDownException e) {
+ // 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
- try {
- // 鏇存柊鍟嗗搧
- LogHelper.test("鏇存柊鍟嗗搧璇︽儏:" + newGoods.getAuctionId());
- taoBaoGoodsUpdateService.updateTaoBaoGoods(newGoods);
- } catch (TaobaoGoodsUpdateException e) {
-
- }
+ taoBaoGoodsUpdateService.deleteTaoBaoGoods(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) {
+ e.printStackTrace();
+ }
+
}
- });
+
+ 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){
+ if (goodsList.size() > 0) {
tb = goodsList.get(0);
}
@@ -1721,19 +1858,18 @@
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(img);
}
-
-
+
JSONObject goods = new JSONObject();
goods.put("auctionId", tb.getAuctionId());
goods.put("imgList", finalImgList);
@@ -1742,75 +1878,82 @@
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));
goods.put("hongBao", hongBao);
// 30澶╅攢閲�
goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
-
+
// 鍒嗕韩璧�
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
- data.put("shareMoney","楼" + shareMoney);
+ data.put("shareMoney", "楼" + shareMoney);
// 鍒嗕韩璧氫汉鎻愮ず
- List<ShamUser> listShareUser = shamUserService.listRandShareUser(10, shareMoney, 1, 5);
+ 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 {
- CollectionGoods collectionGoods =
- collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid), Long.parseLong(id));
+ 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");
+ 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);
-
+ goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);
+
// 棰嗗埜浜哄垪琛�
- List<ShamUser> listCouponUser = null;
-
+ 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())) {
+ if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
couponInfo.put("couponUrl", tb.getCouponLink());
} else {
- couponInfo.put("couponUrl", TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId() + "", pid, tb.getAuctionId() + ""));
+ 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("-", "."));
+ couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ + tb.getCouponEffectiveEndTime().replace("-", "."));
goods.put("couponInfo", couponInfo);
-
- // 棰嗗埜浜哄垪琛�
- listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
+
+ 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();
-
+ 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());
+ jumpUrl = TaoBaoCouponUtil.getCoupleUrl(tb.getCouponActivityId(), clientTBPid.getPid(),
+ "" + tb.getAuctionId());
}
// 璁剧疆璺宠浆閾炬帴
@@ -1821,7 +1964,7 @@
jumpUrl = tb.getAuctionUrl();
}
goods.put("jumpUrl", jumpUrl);
-
+
TaoBaoShopInfo tbShopInfo = redisManager.getTBShopInfo(tb.getShopTitle(), tb.getSellerId(), tb.getAuctionId());
if (tbShopInfo != null) {
String shopType = tbShopInfo.getShopType();
@@ -1833,10 +1976,10 @@
}
// 搴楅摵
goods.put("shopInfo", tbShopInfo);
-
+
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
-
+
data.put("shareUrl", shareUrl);
data.put("goods", goods);
data.put("shareUsers", listShareUser);
@@ -1852,8 +1995,7 @@
ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);
sh.setId(0);
sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(),
- acceptData.getPackages()));
+ sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
sh.setCreatetime(new Date());
if (!StringUtil.isNullOrEmpty(tempUid)) {
sh.setUid(Long.parseLong(tempUid));
@@ -1867,21 +2009,21 @@
});
}
-
/**
* 鑾峰彇鍥炬枃璇︽儏(1.4.0)
+ *
* @param acceptData
* @param id
* @param out
*/
@RequestMapping(value = "getgoodsdetailimgs", method = RequestMethod.POST)
- public void getgoodsdetailimgs(AcceptData acceptData, String id, PrintWriter out) {
+ 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();
@@ -1911,12 +2053,13 @@
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
@@ -1931,44 +2074,42 @@
}
List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
-
+
// 閲嶆柊鍋氭帹鑽�
if (goodsList == null || goodsList.size() == 0) {
-
+
goodsList = new ArrayList<>();
-
+
TaoBaoGoodsBrief goods = null;
-
+
try {
goods = redisManager.getTaoBaoGoodsBrief(id);
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
-
- if (goods == null){
+
+ if (goods == null) {
// 浠庢垜浠殑鍟嗗搧搴撴悳绱�
- CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);
-
+ CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
+ CommonGoods.GOODS_TYPE_TB);
// 鍟嗗搧鏈夋湰鍦扮紦瀛�
if (cgoods != null) {
// 鎸夊悕瀛楁悳绱㈠晢鍝�
SearchFilter sf = new SearchFilter();
sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2));
-
+
TaoBaoSearchResult result = TaoBaoUtil.search(sf);
-
+
if (result != null && result.getTaoBaoGoodsBriefs() != null
- && result.getTaoBaoGoodsBriefs().size() > 0){
-
+ && result.getTaoBaoGoodsBriefs().size() > 0) {
+
for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {
if (goodsList.size() == 10) {
break;
}
goodsList.add(gds);
}
-
}
-
}
}
@@ -1987,16 +2128,16 @@
} catch (Exception e2) {
e2.printStackTrace();
}
-
+
}
}
Map<String, String> map = hongBaoManageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
-
+
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
-
+
goodsList.parallelStream().forEach(goods -> {
// 鑾峰彇璇︽儏
TaoBaoGoodsBrief taoBaoGoodsBrief = null;
@@ -2005,19 +2146,18 @@
} catch (Exception e) {
e.printStackTrace();
}
-
+
if (taoBaoGoodsBrief != null) {
listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
}
-
+
});
-
List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
-
+
try {
List<QualityFactory> listRecommend = qualityGoodsService.recommendByAuctionId(id);
-
+
if (listRecommend != null && listRecommend.size() > 1) {
for (QualityFactory quality : listRecommend) {
@@ -2047,21 +2187,20 @@
} 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