From 784af16411d97c3e14f81dd4ebf1380c8b9effb0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 31 七月 2019 10:33:18 +0800
Subject: [PATCH] 智能推荐修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 139 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 117 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
index 89fe5c6..f0a4374 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java
@@ -38,7 +38,6 @@
import com.yeshi.fanli.entity.taobao.TLJBuyGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
-import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -68,14 +67,12 @@
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoLiJinUtil;
-<<<<<<< HEAD
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.goods.MoneyInfoVO;
import com.yeshi.fanli.vo.goods.OtherInfo;
-=======
import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
->>>>>>> refs/remotes/origin/master
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.tlj.ReduceHongBao;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
import com.yeshi.fanli.vo.tlj.TaoLiJinDetailVO;
import com.yeshi.fanli.vo.user.UserTaoLiJinRecordVO;
@@ -215,8 +212,8 @@
return;
}
- // 杩囨湡
- userTaoLiJinOriginService.overdueHongBao(uid);
+ // 杩囨湡 -鍙栨秷鏀跺洖
+ // userTaoLiJinOriginService.overdueHongBao(uid);
// 鎴戠殑娣樼ぜ閲�
BigDecimal tlj = null;
@@ -236,11 +233,26 @@
BigDecimal thisMonthWin = userTaoLiJinOriginService.countMoneyByDate(uid, 3);
BigDecimal lastMonthWin = userTaoLiJinOriginService.countMoneyByDate(uid, 4);
+ BigDecimal zero = new BigDecimal(0);
// 娑堣��
BigDecimal todayUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 1);
+ if (todayUse == null || todayUse.compareTo(zero) > 0) {
+ todayUse = zero;
+ }
+
BigDecimal yesterdayUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 2);
+ if (yesterdayUse == null || yesterdayUse.compareTo(zero) > 0) {
+ yesterdayUse = zero;
+ }
BigDecimal thisMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 3);
+ if (thisMonthUse == null || thisMonthUse.compareTo(zero) > 0) {
+ thisMonthUse = zero;
+ }
BigDecimal lastMonthUse = userTaoLiJinDetailService.countUseMoneyByDate(uid, 4);
+ if (lastMonthUse == null || lastMonthUse.compareTo(zero) > 0) {
+ lastMonthUse = zero;
+ }
+
// 闂彿閾炬帴
String helpLink = configTaoLiJinService.getValueByKey("hongbao_help_link");
@@ -412,6 +424,7 @@
}
// 鐧诲綍鐢ㄦ埛
+ boolean isReceive = false;
JSONObject data = new JSONObject();
data.put("icon", configTaoLiJinService.getValueByKey("taolijin_system_icon"));
@@ -446,6 +459,7 @@
UserTaoLiJinOrigin userTaoLiJin = userTaoLiJinOriginService.getRankByThisMonth(uid, type);
if (userTaoLiJin != null) { // 宸查鍙�
isRank = true;
+ isReceive = true;
hasMoney = userTaoLiJin.getMoney();
} else {
isRank = false;
@@ -482,7 +496,11 @@
data.put("content", "鎺ㄥ箍绾㈠寘锛屽ソ鍙嬬鍒╋紒");
data.put("type", 1);
data.put("money", hasMoney.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
+ if (isReceive) {
+ data.put("usage", "鏈湀棰嗗彇锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
+ } else {
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
+ }
data.put("jumpName", "鍘讳娇鐢�");
data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));
@@ -562,13 +580,12 @@
array.add(gson.toJson(extra));
}
- executor.execute(new Runnable() {
- @Override
- public void run() {
- // 杩囨湡
- userTaoLiJinOriginService.overdueHongBao(uid);
- }
- });
+ /*// 杩囨湡 -鍙栨秷鏀跺洖
+ * executor.execute(new Runnable() {
+ *
+ * @Override public void run() {
+ * userTaoLiJinOriginService.overdueHongBao(uid); } });
+ */
JSONObject data = new JSONObject();
data.put("count", array.size());
@@ -731,15 +748,93 @@
data.put("count", array.size());
data.put("list", array);
if (page == 1) {
- try {
- List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("zigoulijian_banner");
- if (bannerList != null && bannerList.size() > 0)
- data.put("topPicture", bannerList.get(0).getSrc());
- else
- data.put("topPicture", "");
- } catch (SwiperPictureException e) {
- e.printStackTrace();
+ List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("zigoulijian_banner");
+
+ if (bannerList != null && bannerList.size() > 0)
+ data.put("topPicture", bannerList.get(0).getSrc());
+ else
+ data.put("topPicture", "");
+
+ data.put("ruleUrl", configService.get("zigoulijian_rule"));
+ }
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
+
+ /**
+ * 鍒嗕韩鐖嗘鍟嗗搧-闄愪簬娣樼ぜ閲�
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getBuyGoodsV2", method = RequestMethod.POST)
+ public void getBuyGoodsV2(AcceptData acceptData, int page, PrintWriter out) {
+
+ String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis());
+ List<TLJBuyGoods> listHot = tljBuyGoodsService.listByDay(day);
+ if (listHot == null) {
+ listHot = new ArrayList<TLJBuyGoods>();
+ }
+
+ JSONArray array = new JSONArray();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
+ BigDecimal proportion = TaoBaoConstant.OWN_BUY_WITHOUT_FANLI_RATE;
+ for (TLJBuyGoods hotGoods : listHot) {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();
+ if (taoBaoGoodsBrief == null) {
+ continue;
}
+
+ // 璁＄畻鎺ㄥ箍绾㈠寘
+ BigDecimal spreadMoney = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, proportion);
+
+ // 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
+ if (spreadMoney.compareTo(new BigDecimal(1.0)) < 0) {
+ continue;
+ }
+
+
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, null, proportion, proportion);
+ // 鍘绘帀鏍囩
+ detailVO.setLabels(null);
+
+
+ MoneyInfoVO moneyInfo = detailVO.getMoneyInfo();
+ moneyInfo.setMoneyType(2);
+ detailVO.setMoneyInfo(moneyInfo);
+
+ String hongBao = spreadMoney.toString();
+ ReduceHongBao vo = new ReduceHongBao();
+ vo.setLeft(hotGoods.getLeftHongBaoCount());
+ vo.setMoney(" 楼" + hongBao);
+ vo.setName("浠樻绔嬪噺 ");
+ vo.setTip("");
+ vo.setTotal(hotGoods.getTotalHongBaoCount());
+
+ OtherInfo otherInfo = new OtherInfo();
+ otherInfo.setReduceHongBao(vo);
+ detailVO.setOtherInfo(otherInfo);
+
+ array.add(gson.toJson(detailVO));
+ }
+
+ if (page > 1)
+ array.clear();
+
+ JSONObject data = new JSONObject();
+ data.put("count", array.size());
+ data.put("list", array);
+ if (page == 1) {
+ List<SwiperPicture> bannerList = swiperPictureService.getByBannerCard("zigoulijian_banner");
+
+ if (bannerList != null && bannerList.size() > 0)
+ data.put("topPicture", bannerList.get(0).getSrc());
+ else
+ data.put("topPicture", "");
+
data.put("ruleUrl", configService.get("zigoulijian_rule"));
}
out.print(JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0