From ba94d20eea2cc91a57f4ffed9f09ee0eb6352bfc Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 01 八月 2019 17:55:53 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 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 8516a70..a9d1d0d 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
@@ -72,6 +72,7 @@
import com.yeshi.fanli.vo.goods.OtherInfo;
import com.yeshi.fanli.vo.goods.taobao.TLJBuyHongBaoVO;
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;
@@ -211,8 +212,8 @@
return;
}
- // 杩囨湡
- userTaoLiJinOriginService.overdueHongBao(uid);
+ // 杩囨湡 -鍙栨秷鏀跺洖
+ // userTaoLiJinOriginService.overdueHongBao(uid);
// 鎴戠殑娣樼ぜ閲�
BigDecimal tlj = null;
@@ -579,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());
@@ -670,13 +670,12 @@
array.add(gson.toJson(detailVO));
}
- 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());
@@ -759,5 +758,85 @@
}
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