From c22963a2ee796e59094524cadc5a78c450ed98f8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:54:29 +0800
Subject: [PATCH] 动态分享无券 + 下架 不能分享
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
index a40f032..6c687a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -322,7 +322,7 @@
*/
@RequestMapping("collectionGoods")
public void collectionGoods(long uid, long auctionId, int type, PrintWriter out) {
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,Constant.SOURCE_TYPE_TAOBAO);
if (type == 1) {
if (find != null) {
out.print(JsonUtil.loadFalseResult(""));
@@ -343,7 +343,7 @@
return;
} else {
try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId, Constant.SOURCE_TYPE_TAOBAO);
out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
} catch (CollectionGoodsException e) {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
@@ -362,9 +362,9 @@
* @param out
*/
@RequestMapping("collectionGoodsList")
- public void collectionGoodsList(long uid, int page, int pageSize, PrintWriter out) {
- List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
+ public void collectionGoodsList(long uid, int page, int pageSize, Integer source,PrintWriter out) {
+ List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize, source);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, source);
JSONObject data = new JSONObject();
BigDecimal proportion = hongBaoManageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
--
Gitblit v1.8.0