From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 186 +++++++++++++++++++--------------------------
1 files changed, 79 insertions(+), 107 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..a40f032 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
@@ -5,54 +5,48 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
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 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.log.LogHelper;
-import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
-import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.user.AccountDetailsService;
-import com.yeshi.fanli.service.inter.user.AccountMessageService;
-import com.yeshi.fanli.service.inter.user.BindingAccountService;
-import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.MoneyRecordService;
-import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
-import com.yeshi.fanli.service.inter.user.ShamUserService;
-import com.yeshi.fanli.service.inter.user.UserInfoService;
-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.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 com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.WeiXinUser;
+import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+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.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.order.LostOrderService;
+import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.user.AccountMessageService;
+import com.yeshi.fanli.service.inter.user.ExtractService;
+import com.yeshi.fanli.service.inter.user.ShamUserService;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
+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 net.sf.json.JSONObject;
@Controller
@RequestMapping("api/xcx/v1/XcxCustomer")
@@ -65,28 +59,13 @@
private OrderService orderService;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
- private MoneyRecordService moneyRecordService;
-
- @Resource
- private BindingAccountService bindingAccountService;
-
- @Resource
private ExtractService extractService;
-
- @Resource
- private PassWordErrorRecordService passWordErrorRecordService;
@Resource
private ConfigService configService;
@Resource
private XcxMiniControllerUtil xcxMiniControllerUtil;
-
- @Resource
- private HongBaoMessageService hongBaoMessageService;
@Resource
private ShamUserService shamUserService;
@@ -96,23 +75,17 @@
@Resource
private LostOrderService lostOrderService;
-
- @Resource
- private OrderItemServcie orderItemServcie;
-
- @Resource
- private AccountDetailsService accountDetailsService;
-
+
@Resource
private AccountMessageService accountMessageService;
@Resource
- private CollectionGoodsService collectionGoodsService;
+ private CollectionGoodsV2Service collectionGoodsV2Service;
@Resource
private HongBaoManageService hongBaoManageService;
@Resource
- private WxDownService wxDownService;
+ private RedisManager redisManager;
/**
* 鑾峰彇鐢ㄦ埛淇℃伅
@@ -139,7 +112,7 @@
}
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
- System system = xcxMiniControllerUtil.getSystem(acceptData);
+ BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);
if (system == null) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
return;
@@ -194,9 +167,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 +233,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());
@@ -314,10 +289,10 @@
}
private void outUserInfo(PrintWriter out, String remotIP, UserInfo user, String device) {
- BigDecimal totalmoney = hongBaoService.getTotalHongBaoByUid(user.getId());
+ BigDecimal totalmoney = new BigDecimal(0);
user.setTotalHongBao(totalmoney);
- BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());
- BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());
+ BigDecimal unOpenmoney = new BigDecimal(0);
+ BigDecimal canOpenMoney = new BigDecimal(0);
user.setNoOpenHongBao(unOpenmoney);
user.setCanOpenHongBao(canOpenMoney);
JSONObject data = new JSONObject();
@@ -331,7 +306,6 @@
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
userInfoService.updateLoginInfo(uuser);
- wxDownService.save(device);
}
});
}
@@ -348,24 +322,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 +363,18 @@
*/
@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");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
coList.parallelStream().forEachOrdered(cg -> {
- TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.getTaoBaoGoodsBrief(cg);
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
- fcRate,"");
+ TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), "");
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 +394,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,24 +415,12 @@
*/
@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("鍒犻櫎鎴愬姛"));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 寰俊鐧婚檰
- *
- * @author mawurui createTime 2018骞�4鏈�25鏃� 涓嬪崍5:02:02
- * @param acceptData
- * @param out
- */
- @RequestMapping(value = "isWxDown")
- public void isWxDown(AcceptData acceptData, PrintWriter out) {
- boolean b = wxDownService.isWxDownFirstLogin(acceptData.getDevice());
- JSONObject data = new JSONObject();
- data.put("isFirst", b);
- out.print(JsonUtil.loadTrueResult(data));
}
/**
--
Gitblit v1.8.0