From 0e8e5917dfc650ed6731f9b5d9b068484a365f83 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 三月 2019 15:32:22 +0800
Subject: [PATCH] 提现验证的BUG修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 206 +++++++++++++++++++--------------------------------
1 files changed, 77 insertions(+), 129 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 91cb72c..f1a3fa0 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
@@ -79,7 +79,6 @@
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;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -128,11 +127,7 @@
private SuperRecommendBannerService superRecommendBannerService;
@Resource
- private SuperRecommendSectionService superRecommendSectionService;
-
- @Resource
private SuperRecommendSpecialService superRecommendSpecialService;
-
@Resource
private OrderService orderService;
@@ -227,10 +222,10 @@
@Resource
private UserInfoExtraService userInfoExtraService;
-
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(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()))
@@ -397,7 +392,8 @@
@RequestMapping(value = "getrecommendspecial")
public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -439,7 +435,8 @@
@RequestMapping(value = "guessLike", method = RequestMethod.POST)
public void guessLike(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -477,7 +474,8 @@
@RequestMapping(value = "getrecommendbanner")
public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -544,7 +542,8 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -697,7 +696,8 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -716,38 +716,11 @@
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
// 鐢ㄦ埛宸茬粡鐧诲綍
- if (!StringUtil.isNullOrEmpty(uid)) {
- 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();
- }
+ if (acceptData.getPlatform().equalsIgnoreCase("android"))
+ clientTBPid = tbPidService.getAndroidDefault();
+ else
+ clientTBPid = tbPidService.getIOSDefault();
LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
@@ -1000,25 +973,9 @@
if (!StringUtil.isNullOrEmpty(uid)) {
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();
- }
+ 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();
- }
+ clientTBPid = tbPidService.getIOSDefault();
}
} else {
@@ -1064,7 +1021,8 @@
// 鏍规嵁鍟嗗搧鑾峰彇鎺ㄨ崘
@RequestMapping(value = "getgoodsrecommend", method = RequestMethod.POST)
public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1190,7 +1148,8 @@
return;
}
page = page + 1;
- BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
+ acceptData.getPackages());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
@@ -1235,7 +1194,8 @@
@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());
+ BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
+ acceptData.getPackages());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -1400,7 +1360,8 @@
@RequestMapping(value = "getRecommendInfo")
public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1507,7 +1468,8 @@
public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1645,7 +1607,8 @@
return;
}
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1675,32 +1638,10 @@
} else {
// 鐢ㄦ埛宸茬粡鐧诲綍
- TBPid tbPid = null;
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
-
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
-
- if (tbPid == null) {
- clientTBPid = tbPidService.getAndroidDefault();
- } else {
- 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);
- }
-
+ clientTBPid = tbPidService.getAndroidDefault();
} else {
-
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
-
- if (tbPid == null) {
- clientTBPid = tbPidService.getIOSDefault();
- } else {
- 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);
- }
+ clientTBPid = tbPidService.getIOSDefault();
}
}
@@ -1867,9 +1808,13 @@
String token = "";
if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
- token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
- tb.setCouponLinkTaoToken(token);
+ 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 (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
@@ -1945,7 +1890,7 @@
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() + ""));
@@ -2043,7 +1988,8 @@
@RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -2075,39 +2021,40 @@
});
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();
- }
+//鍒犻櫎鎺ㄨ崘
+//
+// 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) {
@@ -2134,7 +2081,8 @@
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
--
Gitblit v1.8.0