From cdd852f8e8eff7eb2e8f7c3fceaa955b9fc3f9d3 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 29 七月 2019 10:46:32 +0800
Subject: [PATCH] 订单商品类型处理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 ae5ff10..813f67a 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
@@ -665,7 +665,7 @@
taoBaoGoodsBriefExtra.setAuctionUrl(tb.getAuctionUrl());
if (uid != null && !"".equals(uid.trim())) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), Constant.SOURCE_TYPE_TAOBAO);
data.put("collection", collectionGoods != null ? true : false);
}
@@ -925,7 +925,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(Long.parseLong(uid),
- Long.parseLong(id));
+ Long.parseLong(id), Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
} else
data.put("collected", false);
@@ -1190,8 +1190,9 @@
}
// 鑾峰彇娴忚璁板綍
- @RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
+ @RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
public void getScanHistory(AcceptData acceptData, String uid, int page, PrintWriter out) {
+
if (page < 0) {
out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�0"));
return;
@@ -1203,10 +1204,13 @@
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
}
- 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());
+ List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, Constant.SOURCE_TYPE_TAOBAO);
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), Constant.SOURCE_TYPE_TAOBAO);
+
+
+
JSONObject data = new JSONObject();
data.put("count", count);
JSONArray array = new JSONArray();
@@ -1245,7 +1249,6 @@
public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
acceptData.getPackages());
-
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -2079,7 +2082,7 @@
if (uid == null) {
data.put("collected", false);
} else {
- CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id);
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service.findByUidAndAuctionId(uid, id, Constant.SOURCE_TYPE_TAOBAO);
data.put("collected", collectionGoods != null ? true : false);
}
@@ -2118,7 +2121,8 @@
}
String token = "";
- if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink())
+ && VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
token = redisManager.getCommonTaoToken(tb.getAuctionId());
if (StringUtil.isNullOrEmpty(token)) {
token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
@@ -2218,7 +2222,7 @@
// 鏄惁鍔犲叆閫夊搧搴擄細 0鏈姞鍏� 1 宸插姞鍏�
boolean storageState = false;
if (uid != null) {
- storageState = userGoodsStorageService.isExistStorage(uid, id);
+ storageState = userGoodsStorageService.isExistStorage(uid, id, Constant.SOURCE_TYPE_TAOBAO);
}
data.put("storageState", storageState);
--
Gitblit v1.8.0