From 319a0ca57e5a35ce29efb97c4a1a52648a5ce9c6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 28 六月 2019 12:19:52 +0800
Subject: [PATCH] 邀请队友奖励推广红包逻辑修改： 以邀请者当前活跃版本进行判断是否赠送
---
fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
index c55a67c..acdc14e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
@@ -12,6 +12,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.taobao.ShareHotGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -20,6 +21,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -48,25 +50,15 @@
* @param out
*/
@RequestMapping(value = "listPreGoods", method = RequestMethod.GET)
- public void getSugguestSearch(String callback, AcceptData acceptData, String kw, PrintWriter out) {
+ public void listPreGoods(String callback, AcceptData acceptData, String kw, PrintWriter out) {
// 澶ф窐瀹㈡暟鎹紝鏇存柊
-
- List<String> list = TaoBaoUtil.getSuguestSearch(kw);
- if (list != null && list.size() > 0) {
- JSONArray array = new JSONArray();
- int num = 0;
- for (String st : list) {
- array.add(st);
- num = num + 1;
- if (num >= 5) {
- break;
- }
- }
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
- } else {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));
+ List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods();
+ JSONArray array = new JSONArray();
+ Gson gson = new Gson();
+ for (TaoBaoGoodsBrief goods : list) {
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
}
- return;
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
}
/**
@@ -92,10 +84,15 @@
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
}
- if (goods != null) {
- count++;
- goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
- shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
+ if (goods != null && goods.getCouponAmount() != null
+ && goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {
+
+ if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())
+ .compareTo(new BigDecimal("734")) >= 0) {
+ count++;
+ goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
+ shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
+ }
}
}
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("璁剧疆鎴愬姛:" + count)));
@@ -111,6 +108,10 @@
*/
@RequestMapping(value = "listSelectedGoods", method = RequestMethod.GET)
public void listSelectedGoods(String callback, AcceptData acceptData, String day, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(day)) {
+ day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ }
+
List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day);
BigDecimal rate = hongBaoManageService.getFanLiRate();
JSONArray array = new JSONArray();
--
Gitblit v1.8.0