From fd21d973d2cd05f251cbe17adc581aea5adc8760 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 15 十月 2019 09:32:12 +0800
Subject: [PATCH] 品牌更新暂注释
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 610 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 359 insertions(+), 251 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index 107f177..dfdee68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -53,6 +53,7 @@
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
+import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
@@ -81,31 +82,34 @@
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.goods.recommend.HomeRecommendGoodsService;
+import com.yeshi.fanli.service.inter.goods.recommend.RecommendGoodsDeleteHistoryService;
import com.yeshi.fanli.service.inter.homemodule.DeviceSexService;
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.QualityFlashSaleService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
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.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
-import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
+import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
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.service.inter.user.UserMoneyExtraService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
@@ -119,6 +123,8 @@
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
+import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -237,26 +243,33 @@
@Resource
private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
- @Resource
- private GoodsTaoLiJinRateService goodsTaoLiJinRateService;
-
+
@Resource
private UserMoneyExtraService userMoneyExtraService;
-
+
@Resource
private UserTaoLiJinOriginService userTaoLiJinOriginService;
-
+
@Resource
private ConfigTaoLiJinService configTaoLiJinService;
-
+
@Resource
private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;
-
+
@Resource
private DeviceSexService deviceSexService;
-
-
+
+ @Resource
+ private UserTaoLiJinRecordService userTaoLiJinRecordService;
+
+ @Resource
+ private RecommendGoodsDeleteHistoryService recommendGoodsDeleteHistoryService;
+
+ @Resource
+ private HomeRecommendGoodsService homeRecommendGoodsService;
+
+ @Resource
+ private TLJBuyGoodsService tljBuyGoodsService;
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
@@ -652,7 +665,7 @@
taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
if (uid != null && !"".equals(uid.trim())) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), Constant.SOURCE_TYPE_TAOBAO);
data.put("collection", collectionGoods != null ? true : false);
}
@@ -912,7 +925,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
} else
data.put("collected", false);
@@ -1179,6 +1192,7 @@
// 鑾峰彇娴忚璁板綍
@RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
public void getScanHistory(AcceptData acceptData, String uid, int page, PrintWriter out) {
+
if (page < 0) {
out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�0"));
return;
@@ -1190,49 +1204,61 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
- 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();
+ try {
- 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() + "");
+ List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20,
+ Constant.SOURCE_TYPE_TAOBAO);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
+ Constant.SOURCE_TYPE_TAOBAO);
+
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ JSONArray array = new JSONArray();
+
+ 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) {
+ 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));
}
}
- });
-
- Gson gson = gsonBuilder.create();
-
- if (list != null) {
- 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);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ JSONObject data = new JSONObject();
+ data.put("data", new JSONArray());
+ data.put("count", 0);
+ out.print(JsonUtil.loadTrueResult(data));
}
- data.put("data", array);
- out.print(JsonUtil.loadTrueResult(data));
- return;
+
}
@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
acceptData.getPackages());
-
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1282,16 +1308,16 @@
* 闃叉璇锋眰棰戠巼杩囬珮
*
*/
- if (Constant.IS_OUTNET) {
- 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;
- }
- redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
+ String value = redisManager.getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(value)) {
+ out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
+ return;
}
+ redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
+ // }
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
@@ -1325,7 +1351,67 @@
HttpServletRequest request, PrintWriter out) {
int pageSize = Constant.PAGE_SIZE;
JSONArray array = new JSONArray();
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
+ if (VersionUtil.greaterThan_1_5_70(acceptData.getPlatform(), acceptData.getVersion())) {
+ List<TaoBaoGoodsBrief> goodsList = homeRecommendGoodsService.listGoodsByPage(null, acceptData.getDevice(),
+ imei, idfa, page);
+
+ if (page < 4) {// 鍓嶄笁椤靛姞鍏ユ洿鏂�
+ try {
+ taoBaoGoodsUpdateService.addUpdateQueueAsync(goodsList);
+ } catch (Exception e) {
+ }
+ }
+
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null);
+ if (page < 3)
+ extra.setRecommend(true);
+
+ try {
+ array.add(gson.toJson(extra));
+ } catch (Exception e) {
+ e.printStackTrace();
+ System.out.println(new Gson().toJson(goods));
+ }
+ }
+
+ if (page == 1) {
+ List<TLJBuyGoods> list = null;
+ try {
+ list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
+ } catch (Exception e) {
+ }
+ if (list != null && list.size() > 0)
+ for (int i = list.size() - 1; i >= 0; i--) {
+ TLJBuyGoods goods = list.get(i);
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods.getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE + "", null);
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(goods.getGoods(),
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE);
+ TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
+ vo.setLeft(goods.getLeftHongBaoCount());
+ vo.setMoney(hongBao);
+ vo.setTagName("浠樻绔嬪噺 " + hongBao);
+ vo.setTip("");
+ vo.setTotal(goods.getTotalHongBaoCount());
+ extra.setTljBuyHongBao(vo);
+ extra.setPictureTag(new ClientTextStyleVO("绔嬪噺TOP" + (i + 1), "#E5005C", "#FCE431", null));
+ extra.setRecommend(true);
+ extra.setSpreadMoney(vo.getTagName());
+ array.add(0, gson.toJson(extra));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("data", array);
+ data.put("count", 1000);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
+
// 浠庢帹鑽愭潵
if (page <= 1) {
array.clear();
@@ -1339,18 +1425,31 @@
// 绛涢��
List<TaoBaoGoodsBriefExtra> goodsList = new ArrayList<>();
- // 璁惧鎺ㄨ崘
- for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
- if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
- && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
- && goods.getBiz30day() > 1000 && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
+ List<TaoBaoGoodsBrief> gList = recommendGoodsDeleteHistoryService
+ .filterGoods(acceptData.getDevice(), result.getTaoBaoGoodsBriefs());
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,
- proportion.toString(), "");
- extra.setRecommend(true);
- goodsList.add(extra);
- }
+ // filter
+ try {
+
+ gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
+ } catch (Exception e) {
}
+
+ // 璁惧鎺ㄨ崘
+ if (gList != null)
+ for (TaoBaoGoodsBrief goods : gList) {
+ if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && goods.getCouponAmount() != null
+ && goods.getCouponAmount().compareTo(new BigDecimal("5")) >= 0
+ && goods.getBiz30day() > 1000
+ && !StringUtil.isNullOrEmpty(goods.getPictUrlWhite())) {
+
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods,
+ proportion.toString(), "");
+
+ extra.setRecommend(true);
+ goodsList.add(extra);
+ }
+ }
try {
monitorService.addClientAPIMonitor(MonitorFactory.createClientAPI(request, 0,
(int) (java.lang.System.currentTimeMillis() - startTime), "鎺ㄨ崘鏁伴噺:" + goodsList.size()));
@@ -1615,7 +1714,7 @@
try {
// 鑾峰彇璁惧瀹氫箟鎬у埆
int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
-
+
// 1銆佷笓棰樻ā鍧�
JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
@@ -2005,7 +2104,8 @@
if (uid == null) {
data.put("collected", false);
} else {
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id);
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+ Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
}
@@ -2044,14 +2144,16 @@
}
String token = "";
- if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink())
+ && VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
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 (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ tb.setCouponLinkTaoToken(token);
// 鏈嶅姟绔浆閾�
// if (convertInServer &&
@@ -2067,7 +2169,11 @@
couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ tb.getCouponEffectiveEndTime().replace("-", "."));
// 鍒哥殑鍙ｄ护
- couponInfo.put("couponToken", token);
+
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion()))
+ couponInfo.put("couponToken", "");
+ else
+ couponInfo.put("couponToken", token);
goodsJson.put("couponInfo", couponInfo);
if (tb.getBiz30day() >= 1000) {
@@ -2079,6 +2185,8 @@
// 绾㈠寘
if (hongBao == null) {
BigDecimal proportion = manageService.getFanLiRate();
+ if ("taolijin".equalsIgnoreCase(from))
+ proportion = manageService.getTLJShareRate(System.currentTimeMillis());
hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
}
goodsJson.put("hongBao", hongBao);
@@ -2139,7 +2247,7 @@
// 鏄惁鍔犲叆閫夊搧搴擄細 0鏈姞鍏� 1 宸插姞鍏�
boolean storageState = false;
if (uid != null) {
- storageState = userGoodsStorageService.isExistStorage(uid, id);
+ storageState = userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_TAOBAO);
}
data.put("storageState", storageState);
@@ -2149,7 +2257,6 @@
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
String noRebateHelpLink = null;
-
// 鍟嗗搧閾炬帴
String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
@@ -2159,17 +2266,40 @@
} catch (Exception e) {
data.put("h5Url", h5Url);
}
-
+
// 鏄惁鏈夎繑鍒�
boolean fanliValid = true;
- //璧勯噾绫诲瀷 1-杩� 2-濂�
+ // 璧勯噾绫诲瀷 1-杩� 2-濂�
int moneyType = 1;
-
+
// 鎺ㄥ箍绾㈠寘
if (from != null && from.equals("taolijin")) {
+ // 璁＄畻鎺ㄥ箍绾㈠寘
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);
+ BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
+
+ // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
+ if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
+ return;
+ }
+
// 鏄惁涓烘柊鐢ㄦ埛
boolean isNewUser = userInfoExtraService.isNewUser(uid);
- if (!isNewUser) {
+ if (isNewUser) {
+ // 鍒ゅ畾涓鸿�佺敤鎴凤細 鏂颁汉鍙浣跨敤浜嗘柊浜虹孩鍖咃紝涔熷氨鏄偅1鍧楅挶锛岄偅涔堬紝浠栫湅鍒扮殑鍒嗕韩鐖嗘涓殑鍟嗗搧-灏卞彧鑳藉垎浜��
+ long countRecord = userTaoLiJinRecordService.countRecordByUid(uid);
+ if (countRecord > 0) {
+ isNewUser = false;
+ }
+ }
+
+ SpreadHongBao spreadHongBao = new SpreadHongBao();
+ if (isNewUser) {
+ spreadHongBao.setMoney("1");
+ } else {
+ spreadHongBao.setMoney(spreadMoney.toString());
+
moneyType = 2;
fanliValid = false;
ClientTextStyleVO textStyleVO1 = new ClientTextStyleVO();
@@ -2182,52 +2312,72 @@
textStyleVO3.setContent("锛屽ソ鍙�");
textStyleVO3.setColor("#666666");
ClientTextStyleVO textStyleVO4 = new ClientTextStyleVO();
- textStyleVO4.setContent("棰嗙孩鍖�");
+ textStyleVO4.setContent("棰嗙孩鍖咃紒");
textStyleVO4.setColor("#F14242");
-
+
List<ClientTextStyleVO> listText = new ArrayList<ClientTextStyleVO>();
listText.add(textStyleVO1);
listText.add(textStyleVO2);
listText.add(textStyleVO3);
listText.add(textStyleVO4);
-
+
data.put("listTip", listText);
- }
-
- BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(goods);
- // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
- if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {
- out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧涓嶅瓨鍦�"));
- return;
}
- SpreadHongBao spreadHongBao = new SpreadHongBao();
- spreadHongBao.setMoney(spreadMoney.toString());
- spreadHongBao.setTip("褰撴棩棰嗗彇锛屼袱澶╁唴浣跨敤锛岃繃鏃舵棤鏁�");
+ spreadHongBao.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
goodsJson.put("spreadHongBao", spreadHongBao);
-
-
+
// 鐢ㄦ埛鍓╀綑鍙互娣樼ぜ閲戦獙璇�
UserMoneyExtra userMoneyExtra = userMoneyExtraService.selectByPrimaryKey(uid);
- if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
- data.put("userHongbao", new BigDecimal(0).setScale(2));
+ if (userMoneyExtra == null || userMoneyExtra.getTlj() == null) {
+ data.put("userHongbao", new BigDecimal(0).setScale(2).toString());
} else {
- data.put("userHongbao", userMoneyExtra.getTlj().setScale(2));
+ data.put("userHongbao", userMoneyExtra.getTlj().setScale(2).toString());
}
-
- noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link");
+
+ noRebateHelpLink = configTaoLiJinService.getValueByKey("share_goods_help_link", null);
+
+ if (Constant.IS_TEST) {
+ fanliValid = true;
+ goodsJson.put("shareValid", false);
+ JSONObject tljNum = new JSONObject();
+ tljNum.put("percent", "80");
+ tljNum.put("num", "8825");
+ goodsJson.put("tljNum", tljNum);
+ }
+
+ } else if (from != null && from.equals("taolijin_buy")) {
+ noRebateHelpLink = configService.get("zigoulijian_nofanli_help");
+ // 鏌ヨ鍒嗕韩搴�
+ TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),
+ TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
+ if (buyGoods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鑷喘绔嬪噺绾㈠寘杩囨湡"));
+ return;
+ }
+
+ fanliValid = true;
+ goodsJson.put("shareValid", false);
+ String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
+ TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
+ vo.setLeft(buyGoods.getLeftHongBaoCount());
+ vo.setMoney(tljHongBao);
+ vo.setTagName("浠樻绔嬪噺 楼" + tljHongBao);
+ vo.setTip("褰撴棩棰嗗彇锛屽綋鏃ュ唴浣跨敤锛岃繃鏈熷け鏁�");
+ vo.setTotal(buyGoods.getTotalHongBaoCount());
+ goodsJson.put("tljBuyHongBao", vo);
+ moneyType = 2;
}
-
+
goodsJson.put("moneyType", moneyType);
goodsJson.put("fanliValid", fanliValid);
data.put("goods", goodsJson);
-
+
if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {
data.put("noRebateHelpLink", noRebateHelpLink);
} else {
data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));
}
-
-
+
// 鍙栨秷鍒嗕韩娲诲姩
// if (!StringUtil.isNullOrEmpty(uid)
// &&
@@ -2253,7 +2403,7 @@
public void run() {
// 娣诲姞娴忚璁板綍
try {
- scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(),goodsInfo);
+ scanHistoryV2Service.addScanHistory(uid, acceptData.getDevice(), goodsInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2319,119 +2469,83 @@
@RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
- 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 = new ArrayList<TaoBaoGoodsBrief>();
- }
-
- BigDecimal proportion = manageService.getFanLiRate();
-
- List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
-
- TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
- app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
- app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
- app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
-
- List<Long> ids = new ArrayList<>();
- for (TaoBaoGoodsBrief goods : goodsList)
- ids.add(goods.getAuctionId());
-
try {
- goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);
- } catch (TaoKeApiException e1) {
- e1.printStackTrace();
- } catch (TaobaoGoodsDownException e1) {
- e1.printStackTrace();
+
+ List<TaoBaoGoodsBrief> goodsList = TaoKeApiUtil.getRelationGoodsRecommend(id, 10);
+ // 鍒濆鍖�
+ if (goodsList == null) {
+ goodsList = new ArrayList<TaoBaoGoodsBrief>();
+ }
+
+ BigDecimal proportion = manageService.getFanLiRate();
+
+ List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
+
+ TaoKeAppInfo app = new TaoKeAppInfo();
+ app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
+ app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+ app.setAdzoneId(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT.split("_")[3]);
+ app.setPid(TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT);
+
+ List<Long> ids = new ArrayList<>();
+ for (TaoBaoGoodsBrief goods : goodsList)
+ ids.add(goods.getAuctionId());
+
+ try {
+ goodsList = TaoKeApiUtil.getBatchGoodsInfo(ids);
+ } catch (TaoKeApiException e1) {
+ e1.printStackTrace();
+ } catch (TaobaoGoodsDownException e1) {
+ e1.printStackTrace();
+ }
+
+ if (goodsList != null && goodsList.size() > 0)
+ goodsList.parallelStream().forEach(goods -> {
+ if (goods != null) {
+ // 鑾峰彇璇︽儏
+ TaoBaoGoodsBrief taoBaoGoodsBrief = null;
+ try {
+ taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ if (taoBaoGoodsBrief == null) {
+ TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ goods.setCouponInfo(newGoods.getCouponInfo());
+ goods.setCouponLink(newGoods.getCouponLink());
+ goods.setTkRate(newGoods.getTkRate());
+ taoBaoGoodsBrief = goods;
+ }
+
+ if (taoBaoGoodsBrief != null) {
+ listExtra.add(
+ TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
+ }
+ }
+ });
+
+ List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
+
+ // 鍙栧伓鏁颁釜鏁版嵁
+ 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("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
+ data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JSONObject data = new JSONObject();
+ data.put("listQuality", new JSONArray());
+ data.put("listGuess", new JSONArray());
+ out.print(JsonUtil.loadTrueResult(data));
}
-
- if (goodsList != null)
- goodsList.parallelStream().forEach(goods -> {
-
- // 鑾峰彇璇︽儏
- TaoBaoGoodsBrief taoBaoGoodsBrief = null;
- try {
- taoBaoGoodsBrief = taoBaoGoodsCacheUtil.getCommonTaoBaoGoodsInfo(goods.getAuctionId());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- if (taoBaoGoodsBrief == null) {
- TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
- goods.setCouponInfo(newGoods.getCouponInfo());
- goods.setCouponLink(newGoods.getCouponLink());
- goods.setTkRate(newGoods.getTkRate());
- taoBaoGoodsBrief = goods;
- }
-
- if (taoBaoGoodsBrief != null) {
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
- }
-
- });
-
- List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
- // 鍒犻櫎鎺ㄨ崘
- //
- // try {
- // List<QualityFactory> listRecommend =
- // qualityGoodsService.recommendByAuctionId(id);
- //
- // if (listRecommend != null && listRecommend.size() > 1) {
- // for (QualityFactory quality : listRecommend) {
- //
- // TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
- // if (taoBaoGoodsBrief == null) {
- // continue;
- // }
- //
- // int biz30day = taoBaoGoodsBrief.getBiz30day();
- // if (biz30day >= 10000) {
- // double sales = biz30day;
- // String salesCountMidea = String.format("%.1f", sales / 10000);
- // taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
- // } else {
- // taoBaoGoodsBrief.setSalesCount(biz30day + "");
- // }
- //
- // // 鏀瑰彉鍥剧墖灏哄
- // String pictUrl = taoBaoGoodsBrief.getPictUrl();
- // if (!StringUtil.isNullOrEmpty(pictUrl) &&
- // !pictUrl.contains("320x320")) {
- // taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
- // }
- //
- // listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
- // proportion.toString(), null));
- // }
- // }
- // } catch (Exception e2) {
- // e2.printStackTrace();
- // }
-
- // 鍙栧伓鏁颁釜鏁版嵁
- if (listExtra.size() % 2 != 0) {
- listExtra.remove(listExtra.size() - 1);
- }
-
- if (listQuality.size() % 2 != 0) {
- listQuality.remove(listQuality.size() - 1);
- }
-
- JSONObject data = new JSONObject();
- data.put("listQuality", JsonUtil.getApiCommonGson().toJson(listExtra));
- data.put("listGuess", JsonUtil.getApiCommonGson().toJson(listQuality));
-
- out.print(JsonUtil.loadTrueResult(data));
}
/**
@@ -2441,54 +2555,48 @@
* @param out
*/
@RequestMapping(value = "getSpecialActivities")
- public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
+ int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
+ List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
+ platformCode, Integer.parseInt(acceptData.getVersion()));
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
+ List<Special> list = new ArrayList<Special>();
+ if (listSpecial != null) {
+ list.addAll(listSpecial);
}
- try {
- // 涓撻娲诲姩
- String specialCard = "special_activities";
+ for (int i = 0; i < list.size(); i++) {
+ Special special = list.get(i);
- List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
- system.getId());
-
- if (listSpecial == null) {
- listSpecial = new ArrayList<Special>();
+ JumpDetailV2 jumpDetail = special.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail.setNeedLogin(special.isJumpLogin());
+ special.setJumpDetail(jumpDetail);
}
-
- for (Special special: listSpecial) {
-
- JumpDetailV2 jumpDetail = special.getJumpDetail();
- if (jumpDetail != null) {
- jumpDetail.setNeedLogin(special.isJumpLogin());
- special.setJumpDetail(jumpDetail);
- }
-
-
- String name = special.getName();
- if (StringUtil.isNullOrEmpty(name)) {
- continue;
- }
-
- // 鏄惁闇�瑕佸脊鍑烘
- if (name.equals("璐︽埛绛夌骇鐗规潈")) {
+
+ String name = special.getName();
+ if (StringUtil.isNullOrEmpty(name)) {
+ continue;
+ }
+
+ // 鏄惁闇�瑕佸脊鍑烘
+ if (name.equals("璐︽埛绛夌骇鐗规潈")) {
+ if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ list.remove(i);
+ i--;
+ } else {
if (uid != null) {
special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
}
}
}
-
- JSONObject root = new JSONObject();
- root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
- out.print(JsonUtil.loadTrueResult(root));
-
- } catch (Exception e) {
- e.printStackTrace();
}
+
+ JSONObject root = new JSONObject();
+ root.put("special", JsonUtil.getApiCommonGson().toJson(list));
+ if (StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadTrueResult(root));
+ else
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(root));
}
}
--
Gitblit v1.8.0