From 26f7accb815f55f18f8eedfca4324700a96884ec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 八月 2020 18:23:49 +0800
Subject: [PATCH] 资金验证优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 305 +++++++++++++++-----------------------------------
1 files changed, 94 insertions(+), 211 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 6d5f50c..9595198 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
@@ -30,7 +30,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SuperSpecial;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
@@ -49,24 +48,24 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.ScanHistoryV2;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
-import com.yeshi.fanli.entity.taobao.TaoBaoShop;
-import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
+import com.yeshi.common.entity.taobao.TaoBaoShop;
+import com.yeshi.common.entity.taobao.TaoBaoShopInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
-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;
@@ -99,7 +98,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
@@ -110,12 +109,13 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import org.yeshi.utils.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.cache.TaoBaoGoodsCacheUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
@@ -123,10 +123,11 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
-import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.goods.facade.entity.taobao.TLJBuyHongBaoVO;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
+import com.yeshi.common.vo.ClientTextStyleVO;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
-import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -241,7 +242,7 @@
private TaoBaoShopService taoBaoShopService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
@Resource
private UserMoneyExtraService userMoneyExtraService;
@@ -405,7 +406,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);
@@ -436,7 +437,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, "绯荤粺涓嶅瓨鍦�"));
@@ -482,7 +483,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, "绯荤粺涓嶅瓨鍦�"));
@@ -502,7 +503,7 @@
}
}
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
JSONArray array = new JSONArray();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
@@ -521,7 +522,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, "绯荤粺涓嶅瓨鍦�"));
@@ -589,7 +590,7 @@
return;
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -655,7 +656,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());
@@ -679,11 +680,11 @@
// taoBaoGoodsBriefExtra.setAuctionUrl(null);
data.put("taobao", taobaoJson);
- String info = configService.get("detail_prompt");
+ String info = configService.getValue(ConfigKeyEnum.detailPrompt.getKey(),acceptData.getSystem());
data.put("info", info);
- String onlyInfo = configService.get("only_info");
+ String onlyInfo = configService.getValue(ConfigKeyEnum.onlyInfo.getKey(),acceptData.getSystem());
data.put("only", onlyInfo);
- data.put("helpUrl", configService.get("old_goods_detail_help_url"));
+ data.put("helpUrl", configService.getValue(ConfigKeyEnum.oldGoodsDetailHelpUrl.getKey(),acceptData.getSystem()));
int showType = taoBaoGoodsBriefExtra.getShowType();
String price = "";
@@ -698,17 +699,17 @@
data.put("shareTitle", taoBaoGoodsBriefExtra.getTitle());
data.put("shareContent", "楼" + price + "鍏�");
data.put("shareImg", taoBaoGoodsBriefExtra.getPictUrl());
- String html = configService.get("downAPP");
+ 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;
@@ -743,7 +744,7 @@
return;
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -754,7 +755,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();
@@ -771,7 +772,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");
@@ -847,7 +848,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();
@@ -902,8 +903,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澶╅攢閲�
@@ -916,7 +917,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)) {
@@ -1033,7 +1034,7 @@
JSONObject data = new JSONObject();
// 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
- boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
+ boolean convertInServer = configService.isConvertTaoBaoLinkInServer(acceptData.getSystem());
TaoBaoGoodsBrief tb = null;
JSONObject ticket = new JSONObject();
if (convertInServer) {
@@ -1067,7 +1068,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;
@@ -1095,7 +1096,7 @@
// 鎸夊悕瀛楁悳绱㈠晢鍝�
SearchFilter sf = new SearchFilter();
sf.setKey(cgoods.getTitle().substring(0, cgoods.getTitle().length() / 2));
- TaoBaoSearchResult result = TaoBaoUtil.search(sf);
+ TaoBaoSearchResult result = TaoBaoUtil.search(sf,null,null);
if (result != null && result.getTaoBaoGoodsBriefs() != null
&& result.getTaoBaoGoodsBriefs().size() > 0)
for (TaoBaoGoodsBrief gds : result.getTaoBaoGoodsBriefs()) {
@@ -1127,7 +1128,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)
@@ -1195,7 +1196,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;
@@ -1204,10 +1205,10 @@
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20,
- Constant.SOURCE_TYPE_TAOBAO);
+ Constant.SOURCE_TYPE_TAOBAO, true);
long count = scanHistoryV2Service.getCountByDeviceOrUid(
StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
- Constant.SOURCE_TYPE_TAOBAO);
+ Constant.SOURCE_TYPE_TAOBAO, true);
JSONObject data = new JSONObject();
data.put("count", count);
@@ -1229,7 +1230,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());
@@ -1254,7 +1255,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;
@@ -1305,8 +1306,7 @@
*
*/
// if (Constant.IS_OUTNET) {
- String key = "linkParse-" + acceptData.getDevice() + "-" + id;
-
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.taobaolinkParse, acceptData.getDevice() + "-" + id);
String value = redisManager.getCommonString(key);
if (!StringUtil.isNullOrEmpty(value)) {
out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
@@ -1360,7 +1360,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)
@@ -1386,7 +1386,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);
@@ -1411,11 +1411,11 @@
// 浠庢帹鑽愭潵
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();
- TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);
+ TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa,"");
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
// 绛涢��
@@ -1427,7 +1427,7 @@
// filter
try {
- gList = daTaoKeGoodsDetailService.filterTaoBaoGoods(gList);
+ gList = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(gList);
} catch (Exception e) {
}
@@ -1471,7 +1471,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("娌℃湁鏇村浜�"));
@@ -1495,7 +1495,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;
@@ -1580,124 +1580,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<SwiperPicture> listswiper = null;
- if (!StringUtil.isNullOrEmpty(specialCard)) {
- try {
-
- listswiper = swiperPictureService.getByBannerCardAndVersion(swiperCard, acceptData.getPlatform(),
- Integer.parseInt(acceptData.getVersion()));
-
- if (listswiper == null) {
- listswiper = new ArrayList<SwiperPicture>();
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- Special miaoShaSpecial = null;
- List<Special> honestList = new ArrayList<Special>();
- List<Special> specialList = new ArrayList<Special>();
-
- if (!StringUtil.isNullOrEmpty(specialCard)) {
- try {
- List<Special> listSpecial = specialService.listBySystemAndCard(specialCard, system.getId());
-
- if (listSpecial != null && listSpecial.size() > 0) {
- for (Special 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("home_invite_banner"));
-
- 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));
}
/**
@@ -1710,36 +1596,36 @@
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<SwiperPicture> topPicList = getSwiperByCard("index_top", acceptData);
+ List<BannerVO> topPicList = getSwiperByCard("index_top", acceptData);
if (topPicList == null) {
- topPicList = new ArrayList<SwiperPicture>();
+ topPicList = new ArrayList<BannerVO>();
}
root.put("topPicList", JsonUtil.getApiCommonGson().toJson(topPicList));
// 3銆侀個璇锋湁濂�
- List<SwiperPicture> invitePicList = null;
+ 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);
}
if (invitePicList == null) {
- invitePicList = new ArrayList<SwiperPicture>();
+ invitePicList = new ArrayList<BannerVO>();
}
root.put("invitePicList", JsonUtil.getApiCommonGson().toJson(invitePicList));
// 4銆両OS鐨勫簳閮ㄧ綉椤甸摼鎺�
String platform = acceptData.getPlatform();
if ("ios".equalsIgnoreCase(platform)) {
- root.put("htmlLink", configService.get("index_html_link_ios"));
+ root.put("htmlLink", configService.getValue(ConfigKeyEnum.indexHtmlLinkIos.getKey(),acceptData.getSystem()));
}
root.put("spikeGoods", getSpikeGoodsContent(acceptData));
@@ -1762,23 +1648,23 @@
* @param acceptData
* @return
*/
- public List<SwiperPicture> getInvitePicList(Long uid, AcceptData acceptData) {
+ 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;
}
- List<SwiperPicture> invitePicList = getSwiperByCard("index_invite", acceptData);
+ List<BannerVO> invitePicList = getSwiperByCard("index_invite", acceptData);
return invitePicList;
}
- public List<SwiperPicture> getSwiperByCard(String card, AcceptData acceptData) {
- List<SwiperPicture> swiperList = null;
+ public List<BannerVO> getSwiperByCard(String card, AcceptData acceptData) {
+ 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);
@@ -1827,8 +1713,8 @@
nextTime.set(Calendar.MILLISECOND, 0);
JSONArray array = null;
- String timekey = String.format("spikeGoods_hour-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
- String cachekey = String.format("spikeGoodsList-%s-%s", acceptData.getPlatform(), acceptData.getVersion());
+ String timekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsHour,acceptData.getPlatform() +"-"+acceptData.getVersion());
+ String cachekey = RedisKeyEnum.getRedisKey(RedisKeyEnum.spikeGoodsList,acceptData.getPlatform() +"-"+acceptData.getVersion());
String timeValue = redisManager.getCommonString(timekey);
if (timeValue == null || !timeValue.equals(hour + "")) {
@@ -1843,7 +1729,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();
@@ -1865,7 +1751,7 @@
.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
goods.put("jumpDetail", jumpDetail);
JSONObject params = new JSONObject();
- params.put("url", configService.get("spike_goods_link") + "?id=" + taoBaoGoodsBrief.getAuctionId());
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()) + "?id=" + taoBaoGoodsBrief.getAuctionId());
goods.put("params", params);
// 1.5.4鍙婁互鍚庤繑鍥�
@@ -1887,7 +1773,7 @@
root.put("listgoods", array);
JSONObject params = new JSONObject();
- params.put("url", configService.get("spike_goods_link"));
+ params.put("url", configService.getValue(ConfigKeyEnum.spikeGoodsLink.getKey(),acceptData.getSystem()));
root.put("params", params);
root.put("jumpDetail", jumpDetail);
@@ -1913,7 +1799,6 @@
* @param acceptData
* @param id
* @param uid
- * @param pageSource
* 椤甸潰鏉ユ簮
* @param out
*/
@@ -1926,7 +1811,7 @@
}
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1938,7 +1823,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();
@@ -1957,7 +1842,7 @@
final List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
// 鏄惁鍦ㄦ湇鍔＄杩涜杞摼
- boolean convertInServer = configService.isConvertTaoBaoLinkInServer();
+ boolean convertInServer = configService.isConvertTaoBaoLinkInServer(acceptData.getSystem());
JSONObject ticket = new JSONObject();
TaoBaoGoodsBrief goods = null;
@@ -2012,7 +1897,7 @@
}
if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
- TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app,null,null);
if (linkInfo != null) {
goods.setAuctionUrl(linkInfo.getAuctionUrl());
goods.setCouponLink(linkInfo.getCouponLink());
@@ -2073,7 +1958,7 @@
// 澶ф窐瀹㈠晢鍝佽繃婊�
try {
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ goods = daTaoKeGoodsDetailV2Service.filterTaoBaoGoods(goods).getGoods();
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -2090,7 +1975,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>();
@@ -2182,10 +2067,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,12 +2137,12 @@
data.put("shareUrl", shareUrl);
data.put("shareUsers", listShareUser);
data.put("couponUsers", listCouponUser);
- data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
+ data.put("detailWebUrl", "http://apph5.banliapp.com/apppage/goods_img.html?id=" + id);
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));
@@ -2344,7 +2229,7 @@
}
} else if (from != null && from.equals("taolijin_buy")) {
- noRebateHelpLink = configService.get("zigoulijian_nofanli_help");
+ noRebateHelpLink = configService.getValue(ConfigKeyEnum.zigoulijianNofanliHelp.getKey(),acceptData.getSystem());
// 鏌ヨ鍒嗕韩搴�
TLJBuyGoods buyGoods = tljBuyGoodsService.selectByAuctionIdAndDay(goods.getAuctionId(),
TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM-dd"));
@@ -2355,7 +2240,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);
@@ -2373,7 +2258,7 @@
if (!StringUtil.isNullOrEmpty(noRebateHelpLink)) {
data.put("noRebateHelpLink", noRebateHelpLink);
} else {
- data.put("noRebateHelpLink", configService.get("no_rebate_help_link"));
+ data.put("noRebateHelpLink", configService.getValue(ConfigKeyEnum.noRebateHelpLink.getKey(),acceptData.getSystem()));
}
// 鍙栨秷鍒嗕韩娲诲姩
@@ -2427,7 +2312,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) {
@@ -2475,7 +2360,7 @@
goodsList = new ArrayList<TaoBaoGoodsBrief>();
}
- BigDecimal proportion = manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate(acceptData.getSystem());
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
@@ -2509,7 +2394,7 @@
}
if (taoBaoGoodsBrief == null) {
- TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app);
+ TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app,null,null);
goods.setCouponInfo(newGoods.getCouponInfo());
goods.setCouponLink(newGoods.getCouponLink());
goods.setTkRate(newGoods.getTkRate());
@@ -2554,23 +2439,21 @@
*/
@RequestMapping(value = "getSpecialActivities")
public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
- List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
- acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
+ List<SpecialVO> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
+ acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
- List<Special> list = new ArrayList<Special>();
+ List<SpecialVO> list = new ArrayList<SpecialVO>();
if (listSpecial != null) {
list.addAll(listSpecial);
}
for (int i = 0; i < list.size(); i++) {
- Special special = list.get(i);
-
+ SpecialVO special = list.get(i);
JumpDetailV2 jumpDetail = special.getJumpDetail();
if (jumpDetail != null) {
jumpDetail.setNeedLogin(special.isJumpLogin());
special.setJumpDetail(jumpDetail);
}
-
String name = special.getName();
if (StringUtil.isNullOrEmpty(name)) {
continue;
--
Gitblit v1.8.0