From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 1001 ++++++++++++++++++++++++++--------------------------------
1 files changed, 457 insertions(+), 544 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 baa4411..9000ddd 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller.client;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Calendar;
@@ -12,46 +13,45 @@
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;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;
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;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSection;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
-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.system.System;
+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.BusinessSystem;
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;
@@ -60,21 +60,24 @@
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.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
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;
@@ -85,24 +88,29 @@
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.order.ShareGoodsActivityOrderService;
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.UserCustomSettingsService;
+import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
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 com.yeshi.fanli.vo.user.UserSettingsVO;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user")
@@ -112,28 +120,19 @@
private RecommendBannerService recommendService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperRecommendBannerService superRecommendBannerService;
@Resource
- private SuperRecommendSectionService superRecommendSectionService;
-
- @Resource
private SuperRecommendSpecialService superRecommendSpecialService;
-
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
@Resource
private OrderService orderService;
@Resource
- private ScanHistoryService scanHistoryService;
-
- @Resource
- private ShareManageService shareManageService;
+ private ScanHistoryV2Service scanHistoryV2Service;
@Resource
private ConfigService configService;
@@ -157,10 +156,7 @@
private SystemConfigService systemConfigService;
@Resource
- private HonestService honestService;
-
- @Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@@ -197,107 +193,39 @@
@Resource
private ShamUserService shamUserService;
-
+
@Resource
private SpecialService specialService;
-
+
@Resource
private SwiperPictureService swiperPictureService;
-
@Resource
private MonitorService monitorService;
- @RequestMapping(value = "getrecommendsection")
- public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
+ @Resource
+ private CommonGoodsService commonGoodsService;
- if (index < 0) {
- index = 0;
- }
+ @Resource
+ private UserGoodsStorageService userGoodsStorageService;
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
- }
- List<SuperRecommendSection> superRecommendSectionList = superRecommendSectionService
- .getSuperRecommendSectionBySystemId(system.getId());
- List<RecommendSection> recommendSectionList = null;
- for (SuperRecommendSection superRecommendSection : superRecommendSectionList) {
- if (recommendSectionList == null) {
- recommendSectionList = new ArrayList<RecommendSection>();
- }
- RecommendSection recommendSection = superRecommendSection.getRecommendSection();
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
- // 鏆傛椂鏀瑰彉娣樼壒浠风殑璺宠浆鍦板潃
- if (system.getId() == 7) {
- recommendSection.setJumpUrl(recommendSection.getJumpUrl().replace("column.html", "column_ttj.html"));
- }
+ @Resource
+ private UserCustomSettingsService userCustomSettingsService;
- recommendSectionList.add(recommendSection);
- }
- if (recommendSectionList == null) {
- out.print(JsonUtil.loadFalseResult(1, "鏆傛棤鏁版嵁"));
- return;
- }
- Utils.sort(recommendSectionList);
- int size = recommendSectionList.size();
+ @Resource
+ private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
- List<RecommendSectionGoods> recommendSectionGoodsList = null;
- JSONObject data = new JSONObject();
- data.put("count", size);
- JSONArray dataArr = new JSONArray();
- 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");
-
- Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
- for (int i = 0; i < size; i++) {
- validData = new JSONObject();
- RecommendSection recommendSection = recommendSectionList.get(i);
- recommendSectionGoodsList = map.get(recommendSection.getId());
- if (recommendSectionGoodsList == null) {
- continue;
- }
- Utils.sort(recommendSectionGoodsList);
- if (recommendSection.getCounts() < recommendSectionGoodsList.size()) {
- recommendSectionGoodsList = recommendSectionGoodsList.subList(0, recommendSection.getCounts());
- }
- validData.put("count", recommendSectionGoodsList.size());
- validData.put("recommendSection", gson.toJson(recommendSection));
-
- // 鏇挎崲TaoBaoGoodsBrief
- JSONArray array = new JSONArray();
- Gson gson2 = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
- for (RecommendSectionGoods rss : recommendSectionGoodsList) {
- JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
- String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
- gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
- proportion, fcRate, ""));
- obj.put("taoBaoGoodsBrief", json);
- array.add(obj);
- }
-
- validData.put("recommendSectionGoodsList", array);
- dataArr.add(validData);
- }
- data.put("data", dataArr);
-
- String result = JsonUtil.loadTrueResult(data);
- if (Constant.IS_OUTNET)
- redisManager.cacheCommonString("client-api-getRecommendSection", result, 3 * 60);
-
- out.print(result);
- return;
- }
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- List<Honest> honestList = honestService.getHonestListCache();
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
+ 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())
@@ -463,7 +391,8 @@
@RequestMapping(value = "getrecommendspecial")
public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -474,25 +403,28 @@
if (!"1".equals(version) && "android".equalsIgnoreCase(acceptData.getPlatform())) {
jumpDetail = jumpDetailService.getlastJumpDetailCache();
}
+ List<RecommendSpecial> recommendSpecialList = null;
+
List<SuperRecommendSpecial> superRecommendSpecialList = superRecommendSpecialService
.getSuperRecommendSpecialBySystemId(system.getId());
+ if (superRecommendSpecialList != null && superRecommendSpecialList.size() > 0) {
- List<RecommendSpecial> recommendSpecialList = null;
- for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {
- if (recommendSpecialList == null) {
- recommendSpecialList = new ArrayList<RecommendSpecial>();
+ recommendSpecialList = new ArrayList<RecommendSpecial>();
+
+ for (SuperRecommendSpecial superRecommendSpecial : superRecommendSpecialList) {
+ RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();
+ if (jumpDetail != null) {
+ recommendSpecial.setJumpDetail(jumpDetail);
+ }
+ recommendSpecialList.add(recommendSpecial);
}
- RecommendSpecial recommendSpecial = superRecommendSpecial.getRecommendSpecial();
- if (jumpDetail != null) {
- recommendSpecial.setJumpDetail(jumpDetail);
- }
- recommendSpecialList.add(recommendSpecial);
}
if (recommendSpecialList == null || recommendSpecialList.size() == 0) {
out.print(JsonUtil.loadFalseResult(1, "鏆傛棤鏁版嵁"));
return;
}
+
JSONObject data = new JSONObject();
data.put("count", recommendSpecialList.size());
Gson gson = new Gson();
@@ -505,7 +437,8 @@
@RequestMapping(value = "guessLike", method = RequestMethod.POST)
public void guessLike(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -525,15 +458,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();
@@ -545,7 +476,8 @@
@RequestMapping(value = "getrecommendbanner")
public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -612,28 +544,62 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- // 娣樼壒浠�
- if (system.getId() == 7) {
- system = systemService.getSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());
- }
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
- // TaoBaoGoodsBrief alimama = TaoBaoUtil.isAlimama(id);
+
+ // 鑾峰彇浼氬憳鎺ㄥ箍浣嶆垨鑰呴粯璁ゆ帹骞夸綅
+
+ TaoBaoGoodsBrief simpleGoods = null;
+ try {
+ simpleGoods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ } catch (NumberFormatException e2) {
+ e2.printStackTrace();
+ } catch (TaobaoGoodsDownException e2) {
+ e2.printStackTrace();
+ }
+
+ if (simpleGoods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
+ // 鑾峰彇娣樺鍙傛暟
+ ClientTBPid clientTBPid = null;
+ if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
+ String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+ clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET,
+ pid.split("_")[2], pid.split("_")[3]);
+ } 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()))
@@ -646,57 +612,29 @@
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");
@@ -733,16 +671,9 @@
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();
}
@@ -751,11 +682,6 @@
} else {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
- ThreadUtil.run(new Runnable() {
- public void run() {
- recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(Long.parseLong(id));
- }
- });
}
long end = java.lang.System.currentTimeMillis();
java.lang.System.out.println("鑰楁椂:" + (end - begin));
@@ -772,7 +698,8 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -791,38 +718,11 @@
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
// 鐢ㄦ埛宸茬粡鐧诲綍
- if (!StringUtil.isNullOrEmpty(uid)) {
- 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();
- }
+ if (acceptData.getPlatform().equalsIgnoreCase("android"))
+ clientTBPid = tbPidService.getAndroidDefault();
+ else
+ clientTBPid = tbPidService.getIOSDefault();
LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
@@ -958,8 +858,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澶╅攢閲�
@@ -976,7 +876,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
@@ -1045,25 +945,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) {
- //
- // }
}
});
}
@@ -1083,25 +975,9 @@
if (!StringUtil.isNullOrEmpty(uid)) {
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();
- }
+ 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();
- }
+ clientTBPid = tbPidService.getIOSDefault();
}
} else {
@@ -1147,7 +1023,8 @@
// 鏍规嵁鍟嗗搧鑾峰彇鎺ㄨ崘
@RequestMapping(value = "getgoodsrecommend", method = RequestMethod.POST)
public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1168,7 +1045,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();
@@ -1181,16 +1060,6 @@
goodsList.add(gds);
}
}
- }
-
- // 闇�瑕佸彟鍋氭帹鑽�
- if (goodsList.size() < 6) {
- List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);
- if (list != null)
- for (int i = 0; i < list.size(); i++) {
- if (goodsList.size() < 6)
- goodsList.add(list.get(i).getTaoBaoGoodsBrief());
- }
}
}
@@ -1215,15 +1084,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;
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re)));
}
@@ -1250,7 +1117,7 @@
String[] orderArr = order.split(",");
for (String tbOrder : orderArr) {
Order or = new Order();
- or.setBeizhu("绯荤粺娣诲姞");
+ or.setBeizhu("鎺ュ彛娣诲姞");
or.setCreatetime(java.lang.System.currentTimeMillis());
or.setDrawbackTime(0L);
or.setOrderId(tbOrder.trim());
@@ -1283,30 +1150,43 @@
return;
}
page = page + 1;
- System sys = systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
+ acceptData.getPackages());
if (sys == null) {
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();
+
+ GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
+ gsonBuilder.excludeFieldsWithoutExposeAnnotation();
+ gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getTime() + "");
+ }
+ }
+ });
+
+ Gson gson = gsonBuilder.create();
+
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());
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "");
+ extra.setCreatetime(sh.getCreateTime());
+ array.add(gson.toJson(extra));
}
}
data.put("data", array);
@@ -1316,25 +1196,24 @@
@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
- System sys = systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
+ acceptData.getPackages());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
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(""));
@@ -1367,16 +1246,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));
@@ -1415,10 +1296,10 @@
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);
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
@@ -1428,7 +1309,7 @@
for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
&& goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
- && goods.getBiz30day() > 1000)
+ && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite()))
goodsList.add(goods);
}
try {
@@ -1441,7 +1322,7 @@
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 {
@@ -1452,19 +1333,18 @@
}
}
}
- 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();
@@ -1481,34 +1361,17 @@
*/
@RequestMapping(value = "getRecommendInfo")
public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
-
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
// 棣栭〉Banner
- List<RecommendBannerV2> listBanner = null;
-
- List<SuperRecommendBannerV2> listRecommendBanner = superRecommendBannerV2Service
- .getSuperRecommendBannerV2sBySystem(system);
-
- if (listRecommendBanner != null && listRecommendBanner.size() > 0) {
-
- listBanner = new ArrayList<RecommendBannerV2>();
-
- for (SuperRecommendBannerV2 superRecommendBanner : listRecommendBanner) {
- RecommendBannerV2 recommendBanner = superRecommendBanner.getRecommendBanner();
- // 娣樼壒浠锋殏鏃朵慨鏀�
- if (system.getId() == 7) {
- recommendBanner.getJumpDetail().setActivity(recommendBanner.getJumpDetail().getActivity()
- .replace("com.yeshi.ec.rebate.myapplication", "com.yeshi.ec.taospecial"));
- }
-
- listBanner.add(recommendBanner);
- }
- }
+ List<RecommendBannerV2> listBanner = superRecommendBannerV2Service
+ .getSuperRecommendBannerV2sBySystem(system.getId());
JSONObject root = new JSONObject();
root.put("banner", listBanner);
@@ -1579,7 +1442,6 @@
out.print(JsonUtil.loadTrueResult(root));
}
-
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.4.0)
*
@@ -1587,57 +1449,47 @@
* @param out
*/
@RequestMapping(value = "getNewRecommendInfo")
- public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {
+ public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
+ PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
-
- List<SwiperPicture> listswiper = null;
+
+ 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);
- }
+
+ if (listswiper == null) {
+ listswiper = new ArrayList<SwiperPicture>();
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
}
-
+
Special miaoShaSpecial = null;
- List<Special> honestList = new ArrayList<Special>();
+ 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);
-
+ for (Special special : listSpecial) {
+
if ("闄愭椂绉掓潃".equals(special.getName())) {
miaoShaSpecial = special;
continue;
}
-
+
if ("arc".equals(special.getShowType())) {
// 鍚屼竴琛屼笓棰�
honestList.add(special);
@@ -1645,13 +1497,14 @@
// 鍏朵粬涓撻
specialList.add(special);
}
+
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
-
+
}
/* 闄愭椂绉掓潃 - 鏃堕棿澶勭悊 */
@@ -1669,7 +1522,7 @@
break;
}
}
-
+
if (hour < 0)
hour = 24;
long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),
@@ -1678,27 +1531,56 @@
}
JSONObject root = new JSONObject();
- root.put("banner", listswiper);
- root.put("honest", honestList);
- root.put("special", specialList);
+
+ root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper));
+ root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList));
+ root.put("special", JsonUtil.getApiCommonGson().toJson(specialList));
root.put("miaoSha", msJSON);
+ // 澧炲姞閭�璇锋湁濂�
+ JSONObject invite = new JSONObject();
+ JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");
+ invite.put("jumpDetail", jumpDetail);
+ invite.put("picture", configService.get("home_invite_banner"));
+
+ 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)) {
+ if (uid != null) {
+ try {
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 娌℃湁鍏抽棴閭�璇�
+ root.put("invite", invite);
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+ } else
+ root.put("invite", invite);
+ }
+ }
+
out.print(JsonUtil.loadTrueResult(root));
-
+
}
-
-
-
+
/**
* 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
*
* @param acceptData
* @param id
* @param uid
+ * @param pageSource
+ * 椤甸潰鏉ユ簮
* @param out
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
- public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {
+ public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {
if ("0".equalsIgnoreCase(uid)) {
uid = "";
@@ -1709,7 +1591,8 @@
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1729,44 +1612,11 @@
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
- if (StringUtil.isNullOrEmpty(uid)) {
- // 鐢ㄦ埛鏈櫥褰�
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- clientTBPid = tbPidService.getAndroidDefault();
- } else {
- clientTBPid = tbPidService.getIOSDefault();
- }
-
+ // 鐢ㄦ埛鏈櫥褰�
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+ clientTBPid = tbPidService.getAndroidDefault();
} 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);
- }
- }
+ clientTBPid = tbPidService.getIOSDefault();
}
LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
@@ -1789,11 +1639,26 @@
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
+ 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);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ if (linkInfo != null) {
+ goods.setAuctionUrl(linkInfo.getAuctionUrl());
+ goods.setCouponLink(linkInfo.getCouponLink());
+ goods.setTkRate(linkInfo.getTkRate());
+ }
+ }
} catch (TaobaoGoodsDownException e) {
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
- taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
}
});
@@ -1817,10 +1682,23 @@
data.put("ticket", ticket);
}
+ if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ if (linkInfo != null) {
+ goods.setAuctionUrl(linkInfo.getAuctionUrl());
+ goods.setCouponLink(linkInfo.getCouponLink());
+ goods.setTkRate(linkInfo.getTkRate());
+ }
+ }
+
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ }
+ });
}
}
@@ -1846,6 +1724,7 @@
TaoBaoGoodsBrief tb = null;
if (goodsList.size() > 0) {
tb = goodsList.get(0);
+
}
if (tb == null) {
@@ -1861,7 +1740,7 @@
List<String> finalImgList = new ArrayList<>();
for (String img : tb.getImgList()) {
- finalImgList.add(img);
+ finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
}
JSONObject goods = new JSONObject();
@@ -1872,10 +1751,6 @@
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()));
@@ -1892,7 +1767,7 @@
if (StringUtil.isNullOrEmpty(uid)) {
data.put("collected", false);
} else {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collected", collectionGoods != null ? true : false);
}
@@ -1916,11 +1791,28 @@
// 棰嗗埜浜哄垪琛�
List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
+ String hongBao = null;
+
// 鑾峰彇鍒镐俊鎭�
if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
JSONObject couponInfo = new JSONObject();
couponInfo.put("couponPrice", quanPrice.toString());
+
+ if (from != null && from.equals("miandan")) {
+ // 鍏嶅崟鍟嗗搧
+ hongBao = "楼" + quanPrice.toString();
+ }
+
+ String token = "";
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+ token = redisManager.getCommonTaoToken(tb.getAuctionId());
+ if (StringUtil.isNullOrEmpty(token)) {
+ token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
+ redisManager.saveCommonTaoToken(tb.getAuctionId(), token);
+ }
+ }
+ tb.setCouponLinkTaoToken(token);
// 鏈嶅姟绔浆閾�
if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
@@ -1933,6 +1825,8 @@
couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ tb.getCouponEffectiveEndTime().replace("-", "."));
+ // 鍒哥殑鍙ｄ护
+ couponInfo.put("couponToken", token);
goods.put("couponInfo", couponInfo);
if (tb.getBiz30day() >= 1000) {
@@ -1940,6 +1834,13 @@
listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
}
}
+
+ // 绾㈠寘
+ if (hongBao == null) {
+ BigDecimal proportion = manageService.getFanLiRate();
+ hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ }
+ goods.put("hongBao", hongBao);
data.put("tbPidInfo", clientTBPid);
@@ -1974,10 +1875,45 @@
// 鍒嗕韩璺緞
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);
+ // 鍟嗗搧閾炬帴
+ String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
+ Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");
+ try {
+ data.put("h5Url", HttpUtil.getShortLink(h5Url));
+ } catch (Exception e) {
+ data.put("h5Url", h5Url);
+ }
+
+ // 鍙栨秷鍒嗕韩娲诲姩
+ // if (!StringUtil.isNullOrEmpty(uid)
+ // &&
+ // shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid))
+ // > 0) {
+ // } else if(!"miandan".equals(from)) {
+ // // 闈炲厤鍗曞晢鍝�
+ // JSONObject shareActivity = new JSONObject();
+ // shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" +
+ // TaoBaoUtil.getGoodsHongBaoMoney(tb,
+ // new
+ // BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+ // shareActivity.put("ruleDescPicture",
+ // "http://img.flqapp.com/resource/share_activity_img.png");
+ //
+ // data.put("shareActivity", shareActivity);
+ // }
out.print(JsonUtil.loadTrueResult(data));
@@ -1986,16 +1922,10 @@
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);
+ scanHistoryV2Service.addScanHistory(
+ StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),
+ goodsInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2061,76 +1991,20 @@
@RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
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) {
- // 浠庢垜浠殑鍟嗗搧搴撴悳绱�
- CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);
-
- // 鍟嗗搧鏈夋湰鍦扮紦瀛�
- 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) {
-
- for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {
- if (goodsList.size() == 10) {
- break;
- }
- goodsList.add(gds);
- }
-
- }
-
- }
- }
-
- // 闇�瑕佸彟鍋氭帹鑽�
- if (goodsList.size() < 2) {
- try {
- List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);
- if (list != null) {
- for (int i = 0; i < list.size(); i++) {
- if (i == 10) {
- break;
- }
- goodsList.add(list.get(i).getTaoBaoGoodsBrief());
- }
- }
- } catch (Exception e2) {
- e2.printStackTrace();
- }
-
- }
+ // 鍒濆鍖�
+ if (goodsList == null) {
+ goodsList = new ArrayList<TaoBaoGoodsBrief>();
}
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
@@ -2144,45 +2018,49 @@
}
if (taoBaoGoodsBrief != null) {
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
+ 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, fcRate, null));
- }
- }
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ // 鍒犻櫎鎺ㄨ崘
+ //
+ // 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) {
@@ -2194,10 +2072,45 @@
}
JSONObject data = new JSONObject();
- data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listExtra));
- data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listQuality));
+ data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
+ data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 娲诲姩鍒楄〃
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getSpecialActivities")
+ public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
+
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ try {
+ // 涓撻娲诲姩
+ String specialCard = "special_activities";
+
+ List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
+ system.getId());
+
+ if (listSpecial == null) {
+ listSpecial = new ArrayList<Special>();
+ }
+
+ JSONObject root = new JSONObject();
+ root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
+ out.print(JsonUtil.loadTrueResult(root));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0