From 57b80e02ce56e3cacff75ba789fc633ab46b911a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 04 十二月 2018 15:22:25 +0800
Subject: [PATCH] 去除老版本收藏
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 86 +++++++++++++++++++++++++++---------------
1 files changed, 55 insertions(+), 31 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 44b9072..fec0bf2 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
@@ -11,22 +11,26 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
+import org.yeshi.utils.IPUtil;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.tencentcloud.COSManager;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.user.CollectionGoods;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.exception.goods.CollectionGoodsException;
+import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.goods.CollectionGoodsV2;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
+import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
@@ -45,14 +49,13 @@
import com.yeshi.fanli.service.inter.user.WxDownService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.IPUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.tencentcloud.COSManager;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/xcx/v1/XcxCustomer")
@@ -107,12 +110,15 @@
private AccountMessageService accountMessageService;
@Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
@Resource
private WxDownService wxDownService;
+
+ @Resource
+ private RedisManager redisManager;
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -194,9 +200,10 @@
// 鏌ヨ鍒扮殑鐢ㄦ埛淇℃伅涓虹┖,閭ｄ箞闇�瑕佸～鍏呬竴浜涚敤鎴蜂俊鎭�
if (loginType == Constant.WEIXIN) {
form.setPortrait(weiXinUser.getHeadimgurl());
- String wxHeadImg = COSManager.getInstance().uploadFile(
- HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
- Constant.WXHEADURL + UUID.randomUUID().toString()).getUrl();
+ String wxHeadImg = COSManager.getInstance()
+ .uploadFile(HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl()),
+ Constant.WXHEADURL + UUID.randomUUID().toString())
+ .getUrl();
form.setWxPic(wxHeadImg);
form.setNickName(weiXinUser.getNickname());
form.setWxName(weiXinUser.getNickname());
@@ -259,9 +266,10 @@
form.setPortrait(xinUser.getHeadimgurl());
form.setNickName(xinUser.getNickname());
form.setWxName(xinUser.getNickname());
- String wxHeadImg = COSManager.getInstance().uploadFile(
- HttpUtil.getAsInputStream(xinUser.getHeadimgurl()),
- Constant.WXHEADURL + UUID.randomUUID().toString()).getUrl();
+ String wxHeadImg = COSManager.getInstance()
+ .uploadFile(HttpUtil.getAsInputStream(xinUser.getHeadimgurl()),
+ Constant.WXHEADURL + UUID.randomUUID().toString())
+ .getUrl();
form.setWxPic(wxHeadImg);
} else if (formLoginType == Constant.TAOBAO) {
form.setTbName(form.getNickName());
@@ -348,24 +356,32 @@
*/
@RequestMapping("collectionGoods")
public void collectionGoods(long uid, long auctionId, int type, PrintWriter out) {
- CollectionGoods find = collectionGoodsService.findByUidAndAuctionId(uid, auctionId);
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId);
if (type == 1) {
if (find != null) {
- out.print(JsonUtil.loadFalseResult("鎮ㄥ凡鏀惰棌"));
+ out.print(JsonUtil.loadFalseResult(""));
return;
}
- CollectionGoods cg = TaoBaoUtil.getCollectionGoods(auctionId, new UserInfo(uid));
- collectionGoodsService.save(cg);
- out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
- return;
+ try {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
+ out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
+ } catch (TaobaoGoodsDownException e) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ } catch (CollectionGoodsException e1) {
+ out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
+ }
} else {
if (find == null) {
out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
return;
} else {
- collectionGoodsService.delete(find);
- out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
- return;
+ try {
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, auctionId);
+ out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
+ } catch (CollectionGoodsException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ }
}
}
}
@@ -381,20 +397,20 @@
*/
@RequestMapping("collectionGoodsList")
public void collectionGoodsList(long uid, int page, int pageSize, PrintWriter out) {
- List<CollectionGoods> coList = collectionGoodsService.findCollectionGoods(uid, page);
- int count = collectionGoodsService.getCount(uid);
+ List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
JSONObject data = new JSONObject();
Map<String, String> map = hongBaoManageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
coList.parallelStream().forEachOrdered(cg -> {
- TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.getTaoBaoGoodsBrief(cg);
+ TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());
TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
- fcRate,"");
+ fcRate, "");
list.add(taoBaoGoodsBriefExtra);
});
- int totalPage = count % pageSize == 0 ? count / pageSize : count / pageSize + 1;
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
data.put("totalPage", totalPage);
data.put("list", GsonUtil.toJsonExpose(list));
data.put("count", count);
@@ -414,7 +430,11 @@
public void deleteCollectionGoods(String ids, long uid, PrintWriter out) {
if (ids != null) {
Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {
- collectionGoodsService.delete(Long.parseLong(auctionIdStr), uid);
+ try {
+ collectionGoodsV2Service.cancelCollection(uid, Long.parseLong(auctionIdStr));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
});
}
@@ -431,7 +451,11 @@
*/
@RequestMapping("clearConllectionGoods")
public void clearConllectionGoods(long uid, PrintWriter out) {
- collectionGoodsService.clear(uid);
+ try {
+ collectionGoodsV2Service.cancelCollectionByUid(uid);
+ } catch (CollectionGoodsException e) {
+ e.printStackTrace();
+ }
out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
}
--
Gitblit v1.8.0