From 0a21bd61c3c7f33606ea8f571e619e5b1a49c404 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 三月 2019 14:59:41 +0800
Subject: [PATCH] 旧版资金明细删除
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 123 +++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 64 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 ea47819..b31554e 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
@@ -235,10 +235,9 @@
@Resource
private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -640,49 +639,42 @@
return;
}
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- // 娣樼壒浠�
- if (system.getId() == 7) {
- system = systemService.getSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());
- }
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
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();
- }
- }
- } else {
- if (acceptData.getPlatform().equalsIgnoreCase("android"))
- clientTBPid = tbPidService.getAndroidDefault();
- else
- clientTBPid = tbPidService.getIOSDefault();
+ // 鑾峰彇浼氬憳鎺ㄥ箍浣嶆垨鑰呴粯璁ゆ帹骞夸綅
+
+ TaoBaoGoodsBrief simpleGoods = null;
+ try {
+ simpleGoods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ } catch (NumberFormatException e2) {
+ e2.printStackTrace();
+ } catch (TaobaoGoodsDownException e2) {
+ e2.printStackTrace();
}
+ if (simpleGoods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
+ // 鑾峰彇娣樺鍙傛暟
+ ClientTBPid clientTBPid = null;
+ if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
+ String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+ clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET,
+ pid.split("_")[2], pid.split("_")[3]);
+ } else {
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
+ clientTBPid = tbPidService.getAndroidDefault();
+ } else {
+ clientTBPid = tbPidService.getIOSDefault();
+ }
+ }
+
TaoBaoGoodsBrief tb = null;
try {
TaoKeAppInfo app = new TaoKeAppInfo();
@@ -1637,7 +1629,7 @@
listswiper = swiperPictureService.getByBannerCard(swiperCard);
if (listswiper == null) {
- listswiper = new ArrayList<SwiperPicture>();
+ listswiper = new ArrayList<SwiperPicture>();
}
} catch (Exception e) {
@@ -1668,7 +1660,7 @@
// 鍏朵粬涓撻
specialList.add(special);
}
-
+
}
}
@@ -1702,12 +1694,11 @@
}
JSONObject root = new JSONObject();
-
+
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();
@@ -1747,7 +1738,8 @@
* @param acceptData
* @param id
* @param uid
- * @param pageSource 椤甸潰鏉ユ簮
+ * @param pageSource
+ * 椤甸潰鏉ユ簮
* @param out
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
@@ -1968,21 +1960,20 @@
// 棰嗗埜浜哄垪琛�
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();
}
-
-
+
// 鏈嶅姟绔浆閾�
if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
couponInfo.put("couponUrl", tb.getCouponLink());
@@ -2001,14 +1992,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();
@@ -2055,20 +2046,24 @@
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
-
-// 鍙栨秷鍒嗕韩娲诲姩
-// 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;
@@ -2256,7 +2251,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