From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 220 ++++++++++++++-----------------------------------------
1 files changed, 56 insertions(+), 164 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 a9f0f41..841c5a3 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
@@ -408,7 +408,7 @@
honestList.add(honest);
if (acceptData.getPlatform().equalsIgnoreCase("ios")
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem())) {
honest = new Honest();
honest.setName("浠婃棩蹇呮姠");
honest.setJumpDetail(detail);
@@ -439,7 +439,7 @@
public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -485,7 +485,7 @@
public void guessLike(AcceptData acceptData, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -505,7 +505,7 @@
}
}
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
JSONArray array = new JSONArray();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
@@ -524,7 +524,7 @@
public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -592,7 +592,7 @@
return;
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -658,7 +658,7 @@
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
JSONObject data = new JSONObject();
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0));
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(tb, configList.get(0),acceptData.getSystem());
if (!StringUtil.isNullOrEmpty(tb.getCouponLink()) && taoBaoGoodsBriefExtra.getTaoBaoQuanInfo() != null)
taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
@@ -682,11 +682,11 @@
// taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", taobaoJson);
- String info = configService.get(ConfigKeyEnum.detailPrompt.getKey());
+ String info = configService.getValue(ConfigKeyEnum.detailPrompt.getKey(),acceptData.getSystem());
data.put("info", info);
- String onlyInfo = configService.get(ConfigKeyEnum.onlyInfo.getKey());
+ String onlyInfo = configService.getValue(ConfigKeyEnum.onlyInfo.getKey(),acceptData.getSystem());
data.put("only", onlyInfo);
- data.put("helpUrl", configService.get(ConfigKeyEnum.oldGoodsDetailHelpUrl.getKey()));
+ data.put("helpUrl", configService.getValue(ConfigKeyEnum.oldGoodsDetailHelpUrl.getKey(),acceptData.getSystem()));
int showType = taoBaoGoodsBriefExtra.getShowType();
String price = "";
@@ -701,17 +701,17 @@
data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());
data.put("shareContent", "楼" + price + "鍏�");
data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());
- String html = configService.get(ConfigKeyEnum.downAPP.getKey());
+ String html = configService.getValue(ConfigKeyEnum.downAPP.getKey(),acceptData.getSystem());
data.put("downAPP", html);
- String shareSinaContent = configService.get("shareSinaContent");
+ String shareSinaContent = configService.getValue("shareSinaContent",acceptData.getSystem());
data.put("shareSina",
"楼" + price + "鍏� 閫�" + appName + "绾㈠寘楼"
+ taoBaoGoodsBriefExtra.getTaoBaoHongBaoInfo().getHongbao() + "鍏� "
+ taoBaoGoodsBriefExtra.getTitle() + shareSinaContent);
- data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb) + "鍏�");
+ data.put("sharemoney", "鍒嗕韩濂栭噾 楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb,acceptData.getSystem()) + "鍏�");
- data.put("shareHongBao", "楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb));
+ data.put("shareHongBao", "楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb,acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
final TaoBaoGoodsBrief tbb = tb;
@@ -746,7 +746,7 @@
return;
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -757,7 +757,7 @@
data.put("invalid", false);
// IOS鏄惁姝ｅ湪涓婄嚎
if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
- data.put("iosOnling", configService.iosOnLining(Integer.parseInt(acceptData.getVersion())));
+ data.put("iosOnling", configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
}
long startTime = java.lang.System.currentTimeMillis();
@@ -774,7 +774,7 @@
LogHelper.test("鑾峰彇PID鑰楁椂锛�" + (java.lang.System.currentTimeMillis() - startTime));
// 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
- boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
+ boolean convertInServer = configService.isConvertTaoBaoLinkInServer(acceptData.getSystem());
final String clientPid = clientTBPid.getPid();
List<String> taskList = new ArrayList<>();
taskList.add("goods");
@@ -850,7 +850,7 @@
});
}
} else if (task.equalsIgnoreCase("imgs")) {// 鑾峰彇鍥炬枃璇︽儏
- List<ImageInfo> imgs = redisManager.getTaoBaoGoodsDetailImgs(Long.parseLong(id));
+ List<ImageInfo> imgs = redisManager.getTaoBaoGoodsDetailImgs(Long.parseLong(id),acceptData.getSystem());
if (imgs != null && imgs.size() > 0) {
detailImgs.clear();
detailImgsSize.clear();
@@ -905,8 +905,8 @@
goods.put("price", tb.getReservePrice().toString());
goods.put("zkPrice", tb.getZkPrice().toString());
- BigDecimal proportion = manageService.getFanLiRate();
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);
goods.put("hongBao", hongBao);
// 30澶╅攢閲�
@@ -919,7 +919,7 @@
String jumpUrl = "https://item.taobao.com/item.htm?id=" + tb.getAuctionId();
// 鍒嗕韩璧�
- data.put("shareMoney", "楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb));
+ data.put("shareMoney", "楼" + taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb,acceptData.getSystem()));
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
@@ -1036,7 +1036,7 @@
JSONObject data = new JSONObject();
// 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
- boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
+ boolean convertInServer = configService.isConvertTaoBaoLinkInServer(acceptData.getSystem());
TaoBaoGoodsBrief tb = null;
JSONObject ticket = new JSONObject();
if (convertInServer) {
@@ -1070,7 +1070,7 @@
@RequestMapping(value = "getgoodsrecommend", method = RequestMethod.POST)
public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1130,7 +1130,7 @@
List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
if (recommendGoodsList != null)
for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) {
if (taoBaoGoodsBrief == null)
@@ -1198,7 +1198,7 @@
}
page = page + 1;
BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
@@ -1232,7 +1232,7 @@
Gson gson = gsonBuilder.create();
if (list != null) {
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
for (ScanHistoryV2 sh : list) {
TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
goods.setId(sh.getId());
@@ -1257,7 +1257,7 @@
@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());
+ acceptData.getPackages(),acceptData.getSystem());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1362,7 +1362,7 @@
}
}
- BigDecimal rate = hongBaoManageService.getFanLiRate();
+ BigDecimal rate = hongBaoManageService.getFanLiRate(acceptData.getSystem());
for (TaoBaoGoodsBrief goods : goodsList) {
TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null);
if (page < 3)
@@ -1388,7 +1388,7 @@
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);
+ TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE,false);
TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
vo.setLeft(goods.getLeftHongBaoCount());
vo.setMoney(hongBao);
@@ -1413,7 +1413,7 @@
// 浠庢帹鑽愭潵
if (page <= 1) {
array.clear();
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
long startTime = java.lang.System.currentTimeMillis();
@@ -1473,7 +1473,7 @@
proportion.toString());
array.addAll(localArray);
} else {// 浠庣簿閫夊簱鏉�
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
@@ -1497,7 +1497,7 @@
public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1582,117 +1582,10 @@
* @param acceptData
* @param out
*/
+ @Deprecated
@RequestMapping(value = "getNewRecommendInfo")
public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
PrintWriter out) {
-
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
- }
-
- List<BannerVO> listswiper = null;
- if (!StringUtil.isNullOrEmpty(specialCard)) {
- try {
- listswiper = swiperPictureService.getByBannerCardAndVersion(swiperCard, acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
- if (listswiper == null) {
- listswiper = new ArrayList<BannerVO>();
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- Special miaoShaSpecial = null;
- List<SpecialVO> honestList = new ArrayList<SpecialVO>();
- List<SpecialVO> specialList = new ArrayList<SpecialVO>();
-
- if (!StringUtil.isNullOrEmpty(specialCard)) {
- try {
- List<SpecialVO> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());
- if (listSpecial != null && listSpecial.size() > 0) {
- for (SpecialVO special : listSpecial) {
- if ("闄愭椂绉掓潃".equals(special.getName())) {
- miaoShaSpecial = special;
- continue;
- }
-
- if ("arc".equals(special.getShowType())) {
- // 鍚屼竴琛屼笓棰�
- honestList.add(special);
- } else {
- // 鍏朵粬涓撻
- specialList.add(special);
- }
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /* 闄愭椂绉掓潃 - 鏃堕棿澶勭悊 */
- JSONObject msJSON = JSONObject.fromObject(new Gson().toJson(miaoShaSpecial));
- if (miaoShaSpecial != null) {
- // 鑾峰彇绉掓潃
- int[] hours = new int[] { 0, 9, 12, 14, 16, 20, 22 };
- int hour = -1;
- Calendar calendar = Calendar.getInstance();
- calendar.setTimeInMillis(Long.parseLong(acceptData.getTime()));
- int nowHour = calendar.get(Calendar.HOUR_OF_DAY);
- for (int i = 0; i < hours.length - 1; i++) {
- if (nowHour >= hours[i] && nowHour < hours[i + 1]) {
- hour = hours[i + 1];
- break;
- }
- }
-
- if (hour < 0)
- hour = 24;
- long time = TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(calendar.getTimeInMillis(), "yyyy-MM-dd"),
- "yyyy-MM-dd") + 1000 * 60 * 60 * hour;
- msJSON.put("time", time);
- }
-
- 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();
- JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");
- invite.put("jumpDetail", jumpDetail);
- invite.put("picture", configService.get(ConfigKeyEnum.homeInviteBanner.getKey()));
-
- if ("ios".equalsIgnoreCase(acceptData.getPlatform())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
- // 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
- } else {
-
- // 鎸夌収鐗堟湰杩斿洖锛岀増鏈鐩栬冻澶熷悗鍙垹闄�
- if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)
- || ("ios".equalsIgnoreCase(acceptData.getPlatform())
- && Integer.parseInt(acceptData.getVersion()) > 37)) {
- if (uid != null) {
- try {
- UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
- if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 娌℃湁鍏抽棴閭�璇�
- root.put("invite", invite);
- } catch (UserCustomSettingsException e) {
- e.printStackTrace();
- }
- } else
- root.put("invite", invite);
- }
- }
- out.print(JsonUtil.loadTrueResult(root));
}
/**
@@ -1705,10 +1598,10 @@
public void getRecommendIndex(AcceptData acceptData, Long uid, PrintWriter out) {
try {
// 鑾峰彇璁惧瀹氫箟鎬у埆
- int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice());
+ int deviceSex = deviceSexService.getDeviceSex(acceptData.getDevice(),acceptData.getSystem());
// 1銆佷笓棰樻ā鍧�
- JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex);
+ JSONObject root = specialService.listCacheSpecialToIndex(acceptData, deviceSex,acceptData.getSystem());
// 2銆侀《閮ㄨ疆鎾浘
List<BannerVO> topPicList = getSwiperByCard("index_top", acceptData);
@@ -1720,7 +1613,7 @@
// 3銆侀個璇锋湁濂�
List<BannerVO> invitePicList = null;
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem())) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
} else {
invitePicList = getSwiperByCard("index_invite", acceptData);
@@ -1734,7 +1627,7 @@
// 4銆両OS鐨勫簳閮ㄧ綉椤甸摼鎺�
String platform = acceptData.getPlatform();
if ("ios".equalsIgnoreCase(platform)) {
- root.put("htmlLink", configService.get(ConfigKeyEnum.indexHtmlLinkIos.getKey()));
+ root.put("htmlLink", configService.getValue(ConfigKeyEnum.indexHtmlLinkIos.getKey(),acceptData.getSystem()));
}
root.put("spikeGoods", getSpikeGoodsContent(acceptData));
@@ -1760,7 +1653,7 @@
public List<BannerVO> getInvitePicList(Long uid, AcceptData acceptData) {
// 濡傛灉IOS褰撳墠鐗堟湰澶勪簬瀹℃牳鐘舵�佸氨涓嶈繑鍥�
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
- && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
+ && configService.iosOnLining(Integer.parseInt(acceptData.getVersion()),acceptData.getSystem())) {
return null;
}
@@ -1773,7 +1666,7 @@
List<BannerVO> swiperList = null;
try {
swiperList = swiperPictureService.getByBannerCardAndVersion(card, acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
} catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -1838,7 +1731,7 @@
if (array == null) {
array = new JSONArray();
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -1860,7 +1753,7 @@
.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
goods.put("jumpDetail", jumpDetail);
JSONObject params = new JSONObject();
- params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()) + "?id=" + taoBaoGoodsBrief.getAuctionId());
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()) + "?id=" + taoBaoGoodsBrief.getAuctionId());
goods.put("params", params);
// 1.5.4鍙婁互鍚庤繑鍥�
@@ -1882,7 +1775,7 @@
root.put("listgoods", array);
JSONObject params = new JSONObject();
- params.put("url", configService.get(ConfigKeyEnum.spikeGoodsLink.getKey()));
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()));
root.put("params", params);
root.put("jumpDetail", jumpDetail);
@@ -1908,7 +1801,6 @@
* @param acceptData
* @param id
* @param uid
- * @param pageSource
* 椤甸潰鏉ユ簮
* @param out
*/
@@ -1921,7 +1813,7 @@
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1933,7 +1825,7 @@
// IOS鏄惁姝ｅ湪涓婄嚎
if ("ios".equalsIgnoreCase(acceptData.getPlatform())) {
String version = acceptData.getVersion();
- data.put("iosOnling", configService.iosOnLining(Integer.parseInt(version)));
+ data.put("iosOnling", configService.iosOnLining(Integer.parseInt(version),acceptData.getSystem()));
}
long startTime = java.lang.System.currentTimeMillis();
@@ -1952,7 +1844,7 @@
final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
// 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
- boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
+ boolean convertInServer = configService.isConvertTaoBaoLinkInServer(acceptData.getSystem());
JSONObject ticket = new JSONObject();
TaoBaoGoodsBrief goods = null;
@@ -2085,7 +1977,7 @@
goodsJson.put("salesCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
// 鍒嗕韩璧�
- BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
+ BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb,acceptData.getSystem());
data.put("shareMoney", "楼" + shareMoney);
// 鍒嗕韩璧氫汉鎻愮ず
List<ShamUser> listShareUser = new ArrayList<ShamUser>();
@@ -2177,10 +2069,10 @@
// 绾㈠寘
if (hongBao == null) {
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
if ("taolijin".equalsIgnoreCase(from))
- proportion = manageService.getTLJShareRate(System.currentTimeMillis());
- hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ proportion = manageService.getTLJShareRate(System.currentTimeMillis(),acceptData.getSystem());
+ hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion,false);
}
goodsJson.put("hongBao", hongBao);
@@ -2252,7 +2144,7 @@
String noRebateHelpLink = null;
// 鍟嗗搧閾炬帴
- String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
+ String h5Url = String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(acceptData.getSystem()),
Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + "");
try {
data.put("h5Url", HttpUtil.getShortLink(h5Url));
@@ -2339,7 +2231,7 @@
}
} else if (from != null && from.equals("taolijin_buy")) {
- noRebateHelpLink = configService.get(ConfigKeyEnum.zigoulijianNofanliHelp.getKey());
+ noRebateHelpLink = configService.getValue(ConfigKeyEnum.zigoulijianNofanliHelp.getKey(),acceptData.getSystem());
// 鏌ヨ鍒嗕韩搴�
TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),
TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
@@ -2350,7 +2242,7 @@
fanliValid = true;
goodsJson.put("shareValid", false);
- String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70)).toString();
+ String tljHongBao = TaoBaoUtil.getGoodsHongBaoMoney(goods, new BigDecimal(70),false).toString();
TLJBuyHongBaoVO vo = new TLJBuyHongBaoVO();
vo.setLeft(buyGoods.getLeftHongBaoCount());
vo.setMoney(tljHongBao);
@@ -2368,7 +2260,7 @@
if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {
data.put("noRebateHelpLink", noRebateHelpLink);
} else {
- data.put("noRebateHelpLink", configService.get(ConfigKeyEnum.noRebateHelpLink.getKey()));
+ data.put("noRebateHelpLink", configService.getValue(ConfigKeyEnum.noRebateHelpLink.getKey(),acceptData.getSystem()));
}
// 鍙栨秷鍒嗕韩娲诲姩
@@ -2422,7 +2314,7 @@
List<String> detailImgs = new ArrayList<>();
JSONArray detailImgsSize = new JSONArray();
- List<ImageInfo> imgs = redisManager.getTaoBaoGoodsDetailImgs(Long.parseLong(id));
+ List<ImageInfo> imgs = redisManager.getTaoBaoGoodsDetailImgs(Long.parseLong(id),acceptData.getSystem());
if (imgs != null && imgs.size() > 0) {
@@ -2470,7 +2362,7 @@
goodsList = new ArrayList<TaoBaoGoodsBrief>();
}
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
@@ -2550,7 +2442,7 @@
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
List<SpecialVO> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
List<SpecialVO> list = new ArrayList<SpecialVO>();
if (listSpecial != null) {
--
Gitblit v1.8.0