From 020d940ae4e16f55f69cef3dd4c8dc0b9764af07 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 26 六月 2019 10:59:48 +0800
Subject: [PATCH] 邀请对应奖励红包加入版本区分
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/TaoLiJinControllerV2.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 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 7a46a6f..1933e5e 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
@@ -27,13 +27,13 @@
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.tlj.DeviceTaoLiJinRecord;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinDetail.TaoLiJinDetailTypeEnum;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin;
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinOrigin.TaoLiJinOriginEnum;
import com.yeshi.fanli.entity.bus.user.UserMoneyExtra;
import com.yeshi.fanli.entity.bus.user.UserRank;
+import com.yeshi.fanli.entity.taobao.ShareHotGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.tlj.UserTaoLiJinOriginException;
@@ -45,9 +45,9 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.monitor.BusinessEmergent110Service;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
+import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
-import com.yeshi.fanli.service.inter.tlj.GoodsTaoLiJinRateService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinDetailService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
@@ -60,6 +60,7 @@
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.TaoLiJinUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.tlj.TaoLiJinDetailVO;
import com.yeshi.fanli.vo.user.UserTaoLiJinRecordVO;
@@ -120,9 +121,6 @@
private QualityGoodsService qualityGoodsService;
@Resource
- private GoodsTaoLiJinRateService goodsTaoLiJinRateService;
-
- @Resource
private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;
@Resource
@@ -130,7 +128,11 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
+ @Resource
+ private ShareHotGoodsService shareHotGoodsService;
+
+
/**
* 鑾峰彇娣樼ぜ閲戝垎浜褰�
*
@@ -325,7 +327,21 @@
return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy.MM.dd HH:mm"));
}
}
+ }).registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
+ @Override
+ public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ // 淇濈暀2浣嶅皬鏁�
+ value = value.setScale(2);
+ return new JsonPrimitive(value.toString());
+ }
+ }
});
+
+
+
Gson gson = gsonBuilder.create();
JSONObject data = new JSONObject();
@@ -374,9 +390,9 @@
data.put("content", "鑷喘鐩存帴鎶电幇锛屼紭鎯犵湡瀹炲彲瑙侊紒");
data.put("type", 1);
data.put("money", money.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘");
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
data.put("jumpName", "鍘讳娇鐢�");
- data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods"));
+ data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
data.put("rules", configTaoLiJinService.getValueByKey("taolijin_rules"));
@@ -409,9 +425,9 @@
data.put("content", "鑷喘鐩存帴鎶电幇锛屼紭鎯犵湡瀹炲彲瑙侊紒");
data.put("type", 1);
data.put("money", hasMoney.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘");
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
data.put("jumpName", "鍘讳娇鐢�");
- data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods"));
+ data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_newbies_tip"));
} else if(type.equals(TaoLiJinOriginEnum.rankWin.name())) {
@@ -455,9 +471,9 @@
data.put("content", "鎺ㄥ箍绾㈠寘锛屽ソ鍙嬬鍒╋紒");
data.put("type", 1);
data.put("money", hasMoney.setScale(2).toString());
- data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘");
+ data.put("usage", "棰嗗彇鎴愬姛锛屽凡瀛樺叆鈥滄垜鐨�-鎺ㄥ箍绾㈠寘鈥�");
data.put("jumpName", "鍘讳娇鐢�");
- data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_taolijin_goods"));
+ data.put("jumpDetail", jumpDetailV2Service.getByTypeCache("share_goods_hot"));
data.put("tip", configTaoLiJinService.getValueByKey("hongbao_rank_tip"));
}
@@ -478,23 +494,18 @@
* @param out
*/
@RequestMapping(value = "getShareGoods", method = RequestMethod.POST)
- public void getShareGoods(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
+ public void getShareGoods(AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
- if (page == null || page < 1) {
- page = 1;
+ String day = TimeUtil.getGernalTime(java.lang.System.currentTimeMillis());
+ List<ShareHotGoods> listHot = shareHotGoodsService.listByDay(day);
+ if (listHot == null) {
+ listHot = new ArrayList<ShareHotGoods>();
}
-
- int pageSize = 10;
- List<QualityFactory> listFreeGoods = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize);
- if (listFreeGoods == null) {
- listFreeGoods = new ArrayList<QualityFactory>();
- }
- long count = listFreeGoods.size();
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -511,19 +522,22 @@
BigDecimal proportion = hongBaoManageService.getFanLiRate();
- for (QualityFactory qualityFactory : listFreeGoods) {
- TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();
+ for (ShareHotGoods hotGoods : listHot) {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = hotGoods.getGoods();
if (taoBaoGoodsBrief == null) {
continue;
}
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
+ // 璁＄畻鎺ㄥ箍绾㈠寘
+ String warningRate = configTaoLiJinService.getValueByKey("warning_value");
+ BigDecimal spreadMoney = TaoLiJinUtil.getSpreadMoney(warningRate, taoBaoGoodsBrief);
- BigDecimal spreadMoney = goodsTaoLiJinRateService.getGoodsSpreadMoney(taoBaoGoodsBrief);
// 鎺ㄥ箍绾㈠寘 涓嶈兘灏忎簬1
- if (spreadMoney.compareTo(new BigDecimal(1)) < 0) {
+ if (spreadMoney.compareTo(new BigDecimal(1.1)) < 0) {
continue;
}
+
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null);
// 鍘绘帀鏍囩
extra.setLabels(null);
@@ -547,7 +561,7 @@
});
JSONObject data = new JSONObject();
- data.put("count", count);
+ data.put("count", array.size());
data.put("list", array);
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0