From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 22 +++++++++++-----------
1 files changed, 11 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 2c5b6b0..c579457 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
@@ -655,7 +655,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);
}
@@ -915,7 +915,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);
@@ -1181,7 +1181,7 @@
// 鑾峰彇娴忚璁板綍
@RequestMapping(value = "getscanhistory", method = RequestMethod.POST)
- public void getScanHistory(AcceptData acceptData, String uid, int page, Integer source, PrintWriter out) {
+ public void getScanHistory(AcceptData acceptData, String uid, int page, Integer goodsType, PrintWriter out) {
if (page < 0) {
out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�0"));
return;
@@ -1195,10 +1195,10 @@
}
List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(
- StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, source);
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), page, 20, goodsType);
long count = scanHistoryV2Service.getCountByDeviceOrUid(
- StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), source);
+ StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(), goodsType);
JSONObject data = new JSONObject();
data.put("count", count);
@@ -1235,10 +1235,10 @@
}
@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
- public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
+ public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids,
+ Integer goodsType, PrintWriter out) {
BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(),
acceptData.getPackages());
-
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1249,11 +1249,11 @@
for (String auctionIdStr : idStr) {
scanHistoryV2Service.deleteByAuctionIdAndDeviceOrUid(
StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid), acceptData.getDevice(),
- Long.parseLong(auctionIdStr));
+ Long.parseLong(auctionIdStr), goodsType);
}
} else {
scanHistoryV2Service.deleteByDeviceOrUid(StringUtil.isNullOrEmpty(uid) ? null : Long.parseLong(uid),
- acceptData.getDevice());
+ acceptData.getDevice(), goodsType);
}
out.print(JsonUtil.loadTrueResult(""));
@@ -2022,7 +2022,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);
}
@@ -2161,7 +2161,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