From 9a56e9987f4d17d7d838ec05731aa683beee28bd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 15 六月 2019 16:58:50 +0800
Subject: [PATCH] 9.9的618活动商品添加
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
index a4fd90d..db1a9df 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -38,9 +38,11 @@
import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
import com.yeshi.fanli.util.Constant;
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;
@@ -56,7 +58,7 @@
@Resource
private QualityFactoryService selectionGoodsService;
-
+
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@@ -89,10 +91,12 @@
@Resource
private HongBaoManageService hongBaoManageService;
-
+
@Resource
private ConfigService configService;
-
+
+ @Resource
+ private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
/**
* 9.9鍟嗗搧
@@ -114,7 +118,8 @@
*/
@RequestMapping(value = "get19k9")
public void get19k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods(callback, out, page, 500, new BigDecimal(319.9), new BigDecimal(9.9), new BigDecimal(19.9), mcid);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(319.9), new BigDecimal(9.9), new BigDecimal(19.9),
+ mcid);
}
@@ -126,7 +131,8 @@
*/
@RequestMapping(value = "get29k9")
public void get29k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods(callback, out, page, 500, new BigDecimal(429.9), new BigDecimal(19.9), new BigDecimal(29.9), mcid);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(429.9), new BigDecimal(19.9), new BigDecimal(29.9),
+ mcid);
}
@@ -138,7 +144,8 @@
*/
@RequestMapping(value = "get49k9")
public void get49k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods(callback, out, page, 500, new BigDecimal(549.9), new BigDecimal(29.9), new BigDecimal(49.9), mcid);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(549.9), new BigDecimal(29.9), new BigDecimal(49.9),
+ mcid);
}
/**
@@ -153,7 +160,7 @@
* @param out
*/
public void get9k9ClassGoods(String callback, PrintWriter out, Integer page, Integer biz30day, BigDecimal zkPrice,
- BigDecimal minQuanPrice, BigDecimal maxQuanPrice, Long mcid) {
+ BigDecimal minQuanPrice, BigDecimal maxQuanPrice, Long mcid) {
try {
if (page == null || page <= 0) {
page = 1;
@@ -171,15 +178,16 @@
}
// 鏍规嵁鏍囩id 鏌ヨ鏁版嵁
- List<QualityFactory> listQuery = qualityGoodsService.get9k9ClassGoods((page-1)*pageSize, pageSize, biz30day, zkPrice,
- minQuanPrice, maxQuanPrice, mergeCids);
+ List<QualityFactory> listQuery = qualityGoodsService.get9k9ClassGoods((page - 1) * pageSize, pageSize,
+ biz30day, zkPrice, minQuanPrice, maxQuanPrice, mergeCids);
if (listQuery == null || listQuery.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
// 鎬绘潯鏁�
- long count = qualityGoodsService.count9k9ClassGoods(biz30day, zkPrice, minQuanPrice, maxQuanPrice, mergeCids);
+ long count = qualityGoodsService.count9k9ClassGoods(biz30day, zkPrice, minQuanPrice, maxQuanPrice,
+ mergeCids);
JSONArray array = new JSONArray();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
@@ -195,6 +203,20 @@
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));
}
+ // 618娲诲姩
+ if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2019-06-19", "yyyy-MM-dd")) {
+ if (mcid == null || mcid == 0) {
+ count = taoBaoGoodsActivityService.countByPrice(minQuanPrice, maxQuanPrice);
+ List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsActivityService.listByPrice(minQuanPrice,
+ maxQuanPrice.add(new BigDecimal("0.1")), page, pageSize);
+ if (goodsList != null)
+ for (TaoBaoGoodsBrief goods : goodsList) {
+ array.add(gson
+ .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), null)));
+ }
+ }
+ }
+
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", array);
@@ -205,7 +227,6 @@
LogHelper.errorDetailInfo(e);
}
}
-
/**
* 9.9鍟嗗搧-姣忔棩蹇呮姠
@@ -253,7 +274,6 @@
queryEverydayRob(callback, out, page, new BigDecimal(549.9), new BigDecimal(29.9), new BigDecimal(49.9));
}
-
/**
* 姣忔棩蹇呮姠
@@ -305,7 +325,7 @@
} else {
count = 50;
}
-
+
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", array);
@@ -553,7 +573,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal proportion =manageService.getFanLiRate();
+ BigDecimal proportion = manageService.getFanLiRate();
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listMaterial) {
@@ -774,7 +794,7 @@
int pageSize = Constant.PAGE_SIZE;
int type = qualityFlashSaleService.getNowType();
-
+
TaoBaoGoodsBrief goodsBrief = null;
if (page == 1 && auctionId != null) {
List<TaoBaoGoodsBrief> list = taoBaoGoodsBriefService.queryByAuctionId(auctionId);
@@ -784,9 +804,9 @@
}
if (goodsBrief != null) {
- pageSize = pageSize -1;
+ pageSize = pageSize - 1;
}
-
+
List<QualityFactory> listQuery = qualityGoodsService.listQueryByFlashSale((page - 1) * pageSize, pageSize);
// 绮鹃�夊簱鏁版嵁涓虹┖
@@ -807,7 +827,7 @@
if (goodsBrief != null) {
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));
}
-
+
// 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory quality : listQuery) {
@@ -815,7 +835,7 @@
if (taoBaoGoodsBrief == null) {
continue;
}
-
+
if (goodsBrief != null && auctionId.equals(taoBaoGoodsBrief.getAuctionId())) {
continue;
}
@@ -972,7 +992,8 @@
return;
}
- long count = qualityGoodsService.countQueryByRebateAmount(proportion.toString(), startAmount, endAmount, tkRate);
+ long count = qualityGoodsService.countQueryByRebateAmount(proportion.toString(), startAmount, endAmount,
+ tkRate);
// 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
JSONArray array = new JSONArray();
@@ -1030,7 +1051,8 @@
int pageSize = Constant.PAGE_SIZE;
BigDecimal proportion = manageService.getFanLiRate();
- JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion.toString());
+ JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,
+ proportion.toString());
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
@@ -1046,7 +1068,7 @@
out.print(JsonUtil.loadTrueResult(data));
return;
}
-
+
/**
* 瓒呴珮濂栭噾
*
@@ -1060,9 +1082,9 @@
try {
if (page == null || page < 1)
page = 1;
-
+
int pageSize = Constant.PAGE_SIZE;
-
+
List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize);
if (listQuery == null || listQuery.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
@@ -1126,7 +1148,7 @@
continue; // 鍒稿悗浠峰ぇ浜�10
}
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
proportion.toString(), null);
// 灏嗚繑鍒╂敼涓哄埜鍚庝环
TaoBaoHongBaoInfo taoBaoHongBaoInfo = extra.getTaoBaoHongBaoInfo();
@@ -1134,20 +1156,19 @@
taoBaoHongBaoInfo.setHongbao(extra.getQuanPrice());
taoBaoHongBaoInfo.setRate("楼" + extra.getQuanPrice());
}
-
+
array.add(gson.toJson(extra));
}
long count = qualityGoodsService.countFreeGoods();
-
JSONObject data = new JSONObject();
if (page == 1) {
// 鎶藉瑙勫垯
String rules = configService.get("free_goods_rule");
data.put("ruleLink", rules);
}
-
+
data.put("count", count);
data.put("result_list", array);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -1156,5 +1177,5 @@
LogHelper.errorDetailInfo(e);
}
}
-
+
}
--
Gitblit v1.8.0