From 9f09e749e7198051b9af6c2421336a80b58b79a4 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 19 十二月 2018 16:33:12 +0800
Subject: [PATCH] 当日提现成功超过100元 返回高危标识
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 244 +++++++++++++++++++++++++-----------------------
1 files changed, 126 insertions(+), 118 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 4ac2d75..16fe6ab 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
@@ -5,15 +5,11 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
-import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -41,17 +37,19 @@
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;
-import com.yeshi.fanli.entity.bus.user.CollectionGoods;
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.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.SystemClientParams;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
-import com.yeshi.fanli.entity.taobao.ScanHistory;
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -60,18 +58,22 @@
import com.yeshi.fanli.entity.taobao.TaoBaoShopInfo;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.fanli.exception.goods.CommonGoodsException;
+import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
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.CollectionGoodsService;
-import com.yeshi.fanli.service.inter.goods.HonestService;
+import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
+import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
+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;
@@ -87,10 +89,10 @@
import com.yeshi.fanli.service.inter.order.OrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -103,6 +105,9 @@
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user")
@@ -130,7 +135,7 @@
private OrderService orderService;
@Resource
- private ScanHistoryService scanHistoryService;
+ private ScanHistoryV2Service scanHistoryV2Service;
@Resource
private ShareManageService shareManageService;
@@ -157,10 +162,7 @@
private SystemConfigService systemConfigService;
@Resource
- private HonestService honestService;
-
- @Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageMapper hongBaoManageMapper;
@@ -207,6 +209,15 @@
@Resource
private MonitorService monitorService;
+ @Resource
+ private CommonGoodsService commonGoodsService;
+
+ @Resource
+ private UserGoodsStorageService userGoodsStorageService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -249,10 +260,7 @@
JSONObject validData = null;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- Map<String, String> convertMap = hongBaoManageService.convertMap();
- String proportion = convertMap.get("hongbao_goods_proportion");
- String fcRate = convertMap.get("hongbao_fc_ratio");
-
+ BigDecimal proportion = manageService.getFanLiRate();
Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
for (int i = 0; i < size; i++) {
validData = new JSONObject();
@@ -275,7 +283,7 @@
JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
- proportion, fcRate, ""));
+ proportion.toString(), ""));
obj.put("taoBaoGoodsBrief", json);
array.add(obj);
}
@@ -296,7 +304,7 @@
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- List<Honest> honestList = honestService.getHonestListCache();
+ List<Honest> honestList = null;
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
@@ -524,15 +532,13 @@
}
}
- Map<String, String> map = manageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
JSONArray array = new JSONArray();
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra;
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
- taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, "");
+ taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), "");
array.add(gson.toJson(taoBaoGoodsBriefExtra));
}
JSONObject data = new JSONObject();
@@ -689,15 +695,17 @@
taoBaoGoodsBriefExtra.getTaoBaoQuanInfo().setCouponLink(tb.getCouponLink());
taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
if (uid != null && !"".equals(uid.trim())) {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collection", collectionGoods != null ? true : false);
}
data.put("tbPidInfo", clientTBPid);
+ JSONObject taobaoJson = JSONObject.fromObject(gson.toJson(taoBaoGoodsBriefExtra));
+ taobaoJson.put("imgList", taoBaoGoodsBriefExtra.getImgList());
// taoBaoGoodsBriefExtra.setAuctionUrl(null);
- data.put("taobao", gson.toJson(taoBaoGoodsBriefExtra));
+ data.put("taobao", taobaoJson);
String info = configService.get("detail_prompt");
data.put("info", info);
String onlyInfo = configService.get("only_info");
@@ -734,16 +742,9 @@
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
-
- ScanHistory sh = TaoBaoUtil.getScanHistory(tbb);
- sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
- sh.setCreatetime(new Date());
- if (uid != null && !uid.equals("")) {
- sh.setUid(Long.parseLong(uid));
- }
try {
- scanHistoryService.addScanHistory(sh);
+ scanHistoryV2Service.addScanHistory(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),
+ acceptData.getDevice(), tbb);
} catch (Exception e) {
e.printStackTrace();
}
@@ -959,8 +960,8 @@
goods.put("price", tb.getReservePrice().toString());
goods.put("zkPrice", tb.getZkPrice().toString());
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));
+ BigDecimal proportion = manageService.getFanLiRate();
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
goods.put("hongBao", hongBao);
// 30澶╅攢閲�
@@ -977,7 +978,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collected", collectionGoods != null ? true : false);
} else
@@ -1046,25 +1047,17 @@
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
- ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);
- sh.setId(0);
- sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
- sh.setCreatetime(new Date());
- if (!StringUtil.isNullOrEmpty(tempUid)) {
- sh.setUid(Long.parseLong(tempUid));
- }
try {
- scanHistoryService.addScanHistory(sh);
- } catch (Exception e) {
+ scanHistoryV2Service.addScanHistory(
+ StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),
+ goodsInfo);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (CommonGoodsException e) {
+ e.printStackTrace();
+ } catch (ScanHistoryException e) {
e.printStackTrace();
}
-
- // try {
- // taoBaoGoodsBriefService.updateTBGoodsWithNewInfo(goodsInfo);
- // } catch (Exception e) {
- //
- // }
}
});
}
@@ -1169,7 +1162,9 @@
if (goods == null)// 鍟嗗搧涓嬬嚎
{
// 浠庢垜浠殑鍟嗗搧搴撴悳绱�
- CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);
+ CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
+ CommonGoods.GOODS_TYPE_TB);
+
if (cgoods != null) {// 鍟嗗搧鏈夋湰鍦扮紦瀛�
// 鎸夊悕瀛楁悳绱㈠晢鍝�
SearchFilter sf = new SearchFilter();
@@ -1216,15 +1211,13 @@
List<TaoBaoGoodsBriefExtra> re = new ArrayList<TaoBaoGoodsBriefExtra>();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (recommendGoodsList != null)
for (TaoBaoGoodsBrief taoBaoGoodsBrief : recommendGoodsList) {
if (taoBaoGoodsBrief == null)
continue;
- re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
+ re.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getApiCommonGson().toJson(re)));
}
@@ -1289,25 +1282,21 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
- boolean b = NumberUtil.isNumeric(uid);
- long id = 0;
- if (b) {
- id = Long.parseLong(uid);
- }
- List<ScanHistory> list = scanHistoryService.getScanHistory(sys.getId(), acceptData.getDevice(), page, 20, id);
- long count = scanHistoryService.getScanHistoryCount(sys.getId(), acceptData.getDevice(), id);
+ List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice());
JSONObject data = new JSONObject();
data.put("count", count);
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getApiCommonGson();
if (list != null) {
Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
- for (ScanHistory sh : list) {
- sh.setSalesCount(TaoBaoUtil.getSaleCount(sh.getBiz30day()));
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.getTaoBaoGoodsBrief(sh),
- proportion, fcRate, "")));
+ BigDecimal proportion = manageService.getFanLiRate();
+ for (ScanHistoryV2 sh : list) {
+ TaoBaoGoodsBrief goods = TaoBaoUtil.convert(sh.getCommonGoods());
+ goods.setId(sh.getId());
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
}
}
data.put("data", array);
@@ -1324,18 +1313,16 @@
return;
}
- long id = 0;
- if (NumberUtil.isNumeric(uid)) {
- id = Long.parseLong(uid);
- }
-
if ("0".equals(type)) {
String[] idStr = ids.split(",");
for (String auctionIdStr : idStr) {
- scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, Long.parseLong(auctionIdStr), id);
+ scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
+ Long.parseLong(auctionIdStr));
}
} else {
- scanHistoryService.deleteScanHistory(acceptData.getDevice(), sys, id);
+ scanHistoryV2Service.deleteByDeviceOrUid(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),
+ acceptData.getDevice());
}
out.print(JsonUtil.loadTrueResult(""));
@@ -1368,16 +1355,18 @@
/**
* 闃叉璇锋眰棰戠巼杩囬珮
+ *
*/
- String key = "linkParse-" + acceptData.getDevice() + "-" + id;
+ if (Constant.IS_OUTNET) {
+ String key = "linkParse-" + acceptData.getDevice() + "-" + id;
- String value = redisManager.getCommonString(key);
- if (!StringUtil.isNullOrEmpty(value)) {
- out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
- return;
+ String value = redisManager.getCommonString(key);
+ if (!StringUtil.isNullOrEmpty(value)) {
+ out.print(JsonUtil.loadFalseResult(11, "璇锋眰棰戠巼闄愬埗"));
+ return;
+ }
+ redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
}
- redisManager.cacheCommonString(key, "1", 5);// 5s闂撮殧
-
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
@@ -1416,10 +1405,10 @@
if (page <= 1) {
array.clear();
Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
if (!StringUtil.isNullOrEmpty(imei) || !StringUtil.isNullOrEmpty(idfa)) {
long startTime = java.lang.System.currentTimeMillis();
+
TaoBaoSearchResult result = TaoKeApiUtil.guessDeviceLike(page, 50, imei, idfa);
if (result != null && result.getTaoBaoGoodsBriefs() != null) {
@@ -1442,7 +1431,7 @@
Collections.shuffle(goodsList);
goodsList = goodsList.size() > 20 ? goodsList.subList(0, 20) : goodsList;
for (TaoBaoGoodsBrief goods : goodsList) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion, fcRate, "")));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), "")));
}
} else {
try {
@@ -1453,19 +1442,18 @@
}
}
}
- JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion,
- fcRate);
+ JSONArray localArray = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,
+ proportion.toString());
array.addAll(localArray);
} else {// 浠庣簿閫夊簱鏉�
Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
- array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);
+ BigDecimal proportion = manageService.getFanLiRate();
+ array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
return;
}
- long count = qualityGoodsService.countRecommendToIndex(proportion);
+ long count = qualityGoodsService.countRecommendToIndex(proportion.toString());
}
JSONObject data = new JSONObject();
@@ -1683,6 +1671,25 @@
root.put("special", 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");
+
+ 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)) {
+ root.put("invite", invite);
+ }
+ }
+
out.print(JsonUtil.loadTrueResult(root));
}
@@ -1791,7 +1798,7 @@
// 鍟嗗搧涓嬫灦
ThreadUtil.run(new Runnable() {
public void run() {
- taoBaoGoodsUpdateService.deleteTaoBaoGoods(Long.parseLong(id));
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
}
});
@@ -1818,7 +1825,11 @@
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ taoBaoGoodsUpdateService.offlineTaoBaoGoods(Long.parseLong(id));
+ }
+ });
}
}
@@ -1871,8 +1882,8 @@
goods.put("zkPrice", tb.getZkPrice().toString());
// 绾㈠寘
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, new BigDecimal(rateStr));
+ BigDecimal proportion = manageService.getFanLiRate();
+ String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
goods.put("hongBao", hongBao);
// 30澶╅攢閲�
goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
@@ -1890,7 +1901,7 @@
if (StringUtil.isNullOrEmpty(uid)) {
data.put("collected", false);
} else {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
Long.parseLong(id));
data.put("collected", collectionGoods != null ? true : false);
}
@@ -1972,6 +1983,13 @@
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + tb.getAuctionId(), Constant.systemCommonConfig.getAppShareInfoUrl());
+ // 鏄惁鍔犲叆閫夊搧搴擄細 0鏈姞鍏� 1 宸插姞鍏�
+ boolean storageState = false;
+ if (uid != null && uid.trim().length() > 0) {
+ storageState = userGoodsStorageService.isExistStorage(Long.parseLong(uid), Long.parseLong(id));
+ }
+
+ data.put("storageState", storageState);
data.put("shareUrl", shareUrl);
data.put("goods", goods);
data.put("shareUsers", listShareUser);
@@ -1984,16 +2002,10 @@
ThreadUtil.run(new Runnable() {
public void run() {
// 娣诲姞娴忚璁板綍
- ScanHistory sh = TaoBaoUtil.getScanHistory(goodsInfo);
- sh.setId(0);
- sh.setDevice(acceptData.getDevice());
- sh.setSystem(systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages()));
- sh.setCreatetime(new Date());
- if (!StringUtil.isNullOrEmpty(tempUid)) {
- sh.setUid(Long.parseLong(tempUid));
- }
try {
- scanHistoryService.addScanHistory(sh);
+ scanHistoryV2Service.addScanHistory(
+ StringUtil.isNullOrEmpty(tempUid) ? null : Long.parseLong(tempUid), acceptData.getDevice(),
+ goodsInfo);
} catch (Exception e) {
e.printStackTrace();
}
@@ -2082,8 +2094,8 @@
if (goods == null) {
// 浠庢垜浠殑鍟嗗搧搴撴悳绱�
- CollectionGoods cgoods = collectionGoodsService.findByAuctionId(id);
-
+ CommonGoods cgoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(id,
+ CommonGoods.GOODS_TYPE_TB);
// 鍟嗗搧鏈夋湰鍦扮紦瀛�
if (cgoods != null) {
// 鎸夊悕瀛楁悳绱㈠晢鍝�
@@ -2101,9 +2113,7 @@
}
goodsList.add(gds);
}
-
}
-
}
}
@@ -2126,9 +2136,7 @@
}
}
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = manageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> listExtra = new ArrayList<TaoBaoGoodsBriefExtra>();
@@ -2142,7 +2150,7 @@
}
if (taoBaoGoodsBrief != null) {
- listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, ""));
+ listExtra.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), ""));
}
});
@@ -2175,7 +2183,7 @@
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
}
- listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null));
+ listQuality.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null));
}
}
} catch (Exception e2) {
--
Gitblit v1.8.0