From deee140ea399729c941261387c2c62b161e79e34 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 23 九月 2019 19:18:43 +0800
Subject: [PATCH] oppo推送
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 324 ++++++++++++++++++++++++++++-------------------------
1 files changed, 169 insertions(+), 155 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 9451178..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
@@ -88,12 +88,13 @@
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;
@@ -109,7 +110,6 @@
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;
@@ -1190,9 +1190,9 @@
}
// 鑾峰彇娴忚璁板綍
- @RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
+ @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;
@@ -1204,45 +1204,55 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
- 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);
+ try {
+ 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();
+ 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() + "");
+ 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)
@@ -1341,10 +1351,18 @@
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) {
@@ -1361,7 +1379,11 @@
}
if (page == 1) {
- List<TLJBuyGoods> list = homeRecommendGoodsService.getZiGouLiJianHotGoods(acceptData.getDevice());
+ 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);
@@ -2082,7 +2104,8 @@
if (uid == null) {
data.put("collected", false);
} else {
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id, Constant.SOURCE_TYPE_TAOBAO);
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id,
+ Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
}
@@ -2121,7 +2144,8 @@
}
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());
@@ -2161,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);
@@ -2249,7 +2275,7 @@
// 鎺ㄥ箍绾㈠寘
if (from != null && from.equals("taolijin")) {
// 璁＄畻鎺ㄥ箍绾㈠寘
- String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value", null);
BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, goods);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
@@ -2308,7 +2334,7 @@
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;
@@ -2443,82 +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();
- }
- 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();
+ 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(), ""));
+ }
}
+ });
- if (taoBaoGoodsBrief == null) {
- TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
- goods.setCouponInfo(newGoods.getCouponInfo());
- goods.setCouponLink(newGoods.getCouponLink());
- goods.setTkRate(newGoods.getTkRate());
- taoBaoGoodsBrief = goods;
- }
+ List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
- if (taoBaoGoodsBrief != null) {
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
- }
- }
- });
+ // 鍙栧伓鏁颁釜鏁版嵁
+ if (listExtra.size() % 2 != 0) {
+ listExtra.remove(listExtra.size() - 1);
+ }
- List<TaoBaoGoodsBrief> listQuality = new ArrayList<TaoBaoGoodsBrief>();
+ if (listQuality.size() % 2 != 0) {
+ listQuality.remove(listQuality.size() - 1);
+ }
- // 鍙栧伓鏁颁釜鏁版嵁
- if (listExtra.size() % 2 != 0) {
- listExtra.remove(listExtra.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 (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));
}
/**
@@ -2528,61 +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 {
+ for (int i = 0; i < list.size(); i++) {
+ Special special = list.get(i);
- List<Special> list = new ArrayList<Special>();
- // 涓撻娲诲姩
- String specialCard = "special_activities";
-
- List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
- system.getId());
-
- if (listSpecial != null) {
- list.addAll(listSpecial);
+ JumpDetailV2 jumpDetail = special.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail.setNeedLogin(special.isJumpLogin());
+ special.setJumpDetail(jumpDetail);
}
- for (int i = 0; i < list.size(); i++) {
- Special special = list.get(i);
+ String name = special.getName();
+ if (StringUtil.isNullOrEmpty(name)) {
+ continue;
+ }
- 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("璐︽埛绛夌骇鐗规潈")) {
- if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
- list.remove(i);
- i--;
- } else {
- if (uid != null) {
- special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
- }
+ // 鏄惁闇�瑕佸脊鍑烘
+ 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(list));
- 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