From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 488 ++++++++++++++++++++++++++---------------------------
1 files changed, 239 insertions(+), 249 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 4f6a9fe..ed25d0c 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,19 +13,21 @@
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.BigDecimalUtil;
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;
@@ -41,17 +44,19 @@
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;
@@ -60,18 +65,22 @@
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;
@@ -87,10 +96,10 @@
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;
@@ -103,6 +112,9 @@
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")
@@ -130,7 +142,7 @@
private OrderService orderService;
@Resource
- private ScanHistoryService scanHistoryService;
+ private ScanHistoryV2Service scanHistoryV2Service;
@Resource
private ShareManageService shareManageService;
@@ -157,10 +169,7 @@
private SystemConfigService systemConfigService;
@Resource
- private HonestService honestService;
-
- @Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@@ -197,16 +206,24 @@
@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) {
@@ -250,10 +267,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();
@@ -276,7 +290,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);
}
@@ -297,7 +311,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())
@@ -525,15 +539,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();
@@ -622,18 +634,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()))
@@ -646,57 +698,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 +757,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();
}
@@ -958,8 +975,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 +993,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 +1062,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) {
- //
- // }
}
});
}
@@ -1168,7 +1177,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();
@@ -1215,15 +1226,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)));
}
@@ -1288,25 +1297,37 @@
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);
@@ -1323,18 +1344,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(""));
@@ -1367,16 +1386,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 +1436,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) {
@@ -1441,7 +1462,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 +1473,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,7 +1501,7 @@
*/
@RequestMapping(value = "getRecommendInfo")
public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
-
+
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -1579,7 +1599,6 @@
out.print(JsonUtil.loadTrueResult(root));
}
-
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.4.0)
*
@@ -1594,15 +1613,15 @@
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) {
+ for (SwiperPicture swiperPicture : listswiper) {
swiperPicture.setBannerId(null);
swiperPicture.setCreatetime(null);
swiperPicture.setUpdatetime(null);
@@ -1610,34 +1629,34 @@
swiperPicture.setRemark(null);
}
}
-
+
} 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) {
+ 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);
@@ -1647,11 +1666,11 @@
}
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
-
+
}
/* 闄愭椂绉掓潃 - 鏃堕棿澶勭悊 */
@@ -1669,7 +1688,7 @@
break;
}
}
-
+
if (hour < 0)
hour = 24;
long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),
@@ -1683,12 +1702,29 @@
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)
*
@@ -1793,7 +1829,7 @@
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
- taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
}
});
@@ -1820,7 +1856,11 @@
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ }
+ });
}
}
@@ -1861,7 +1901,7 @@
List<String> finalImgList = new ArrayList<>();
for (String img : tb.getImgList()) {
- finalImgList.add(img);
+ finalImgList.add(TbImgUtil.getTBSizeImg(img, 600));
}
JSONObject goods = new JSONObject();
@@ -1873,8 +1913,8 @@
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澶╅攢閲�
goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
@@ -1883,13 +1923,16 @@
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
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),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collected", collectionGoods != null ? true : false);
}
@@ -1911,7 +1954,7 @@
goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);
// 棰嗗埜浜哄垪琛�
- List<ShamUser> listCouponUser = null;
+ List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
// 鑾峰彇鍒镐俊鎭�
if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
@@ -1932,8 +1975,10 @@
+ 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);
@@ -1969,10 +2014,18 @@
// 鍒嗕韩璺緞
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));
@@ -1981,16 +2034,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();
}
@@ -2063,69 +2110,12 @@
}
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>();
@@ -2139,7 +2129,7 @@
}
if (taoBaoGoodsBrief != null) {
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
+ listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
}
});
@@ -2172,7 +2162,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));
+ listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
}
}
} catch (Exception e2) {
--
Gitblit v1.8.0