From 68712c0011ad547aa8fbafff06c91435cb66bf86 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 17:03:09 +0800
Subject: [PATCH] 小米推送测试环境不推送，系统修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 188 +++++++++++++++++++++++-----------------------
1 files changed, 93 insertions(+), 95 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 f456c36..28e7a7b 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
@@ -46,14 +46,13 @@
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.bus.user.UserInfoExtra;
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.BusinessSystem;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
@@ -72,11 +71,11 @@
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.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
@@ -105,6 +104,7 @@
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.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
@@ -129,7 +129,7 @@
private RecommendBannerService recommendService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperRecommendBannerService superRecommendBannerService;
@@ -235,10 +235,9 @@
@Resource
private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -247,7 +246,7 @@
index = 0;
}
- 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;
@@ -325,7 +324,7 @@
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ 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()))
@@ -492,7 +491,7 @@
@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, "绯荤粺涓嶅瓨鍦�"));
@@ -534,7 +533,7 @@
@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, "绯荤粺涓嶅瓨鍦�"));
@@ -572,7 +571,7 @@
@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, "绯荤粺涓嶅瓨鍦�"));
@@ -639,48 +638,41 @@
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 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 (!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 (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"))
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
clientTBPid = tbPidService.getAndroidDefault();
- else
+ } else {
clientTBPid = tbPidService.getIOSDefault();
+ }
}
TaoBaoGoodsBrief tb = null;
@@ -804,7 +796,7 @@
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, "绯荤粺涓嶅瓨鍦�"));
@@ -1171,7 +1163,7 @@
// 鏍规嵁鍟嗗搧鑾峰彇鎺ㄨ崘
@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;
@@ -1274,7 +1266,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());
@@ -1307,7 +1299,7 @@
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;
@@ -1352,7 +1344,7 @@
@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, "绯荤粺涓嶅瓨鍦�"));
@@ -1517,7 +1509,7 @@
@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;
@@ -1624,7 +1616,7 @@
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;
@@ -1636,14 +1628,8 @@
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) {
@@ -1661,12 +1647,6 @@
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special : listSpecial) {
- special.setCreatetime(null);
- special.setUpdatetime(null);
- special.setState(null);
- special.setRemark(null);
- special.setCard(null);
- special.setCardId(null);
if ("闄愭椂绉掓潃".equals(special.getName())) {
miaoShaSpecial = special;
@@ -1680,6 +1660,7 @@
// 鍏朵粬涓撻
specialList.add(special);
}
+
}
}
@@ -1713,16 +1694,17 @@
}
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", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");
+ invite.put("picture", configService.get("home_invite_banner"));
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
@@ -1756,7 +1738,8 @@
* @param acceptData
* @param id
* @param uid
- * @param pageSource 椤甸潰鏉ユ簮
+ * @param pageSource
+ * 椤甸潰鏉ユ簮
* @param out
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
@@ -1771,7 +1754,7 @@
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;
@@ -1800,7 +1783,6 @@
}
} else {
-
// 鐢ㄦ埛宸茬粡鐧诲綍
TBPid tbPid = null;
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
@@ -1912,6 +1894,7 @@
TaoBaoGoodsBrief tb = null;
if (goodsList.size() > 0) {
tb = goodsList.get(0);
+
}
if (tb == null) {
@@ -1977,21 +1960,26 @@
// 棰嗗埜浜哄垪琛�
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 = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
+ tb.setCouponLinkTaoToken(token);
+ }
+
// 鏈嶅姟绔浆閾�
if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
couponInfo.put("couponUrl", tb.getCouponLink());
@@ -2003,6 +1991,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) {
@@ -2010,14 +2000,14 @@
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);
String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();
@@ -2059,25 +2049,33 @@
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);
+ //鍟嗗搧閾炬帴
+ data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
+ Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));
-
-// 鍙栨秷鍒嗕韩娲诲姩
-// 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);
-// }
-
+ // 鍙栨秷鍒嗕韩娲诲姩
+ // 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));
final String tempUid = uid;
@@ -2154,7 +2152,7 @@
@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;
@@ -2245,7 +2243,7 @@
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, 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;
@@ -2265,7 +2263,7 @@
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