From aad0554cc7f18a6ec05e2e5e646b5e501d41617d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 10 七月 2019 17:13:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 3f4ded1..f2a129a 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
@@ -21,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;
@@ -52,11 +53,10 @@
public void listPreGoods(String callback, AcceptData acceptData, String kw, PrintWriter out) {
// 澶ф窐瀹㈡暟鎹紝鏇存柊
List<TaoBaoGoodsBrief> list = shareHotGoodsService.listPreGoods();
- BigDecimal rate = hongBaoManageService.getFanLiRate();
JSONArray array = new JSONArray();
Gson gson = new Gson();
for (TaoBaoGoodsBrief goods : list) {
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, rate + "", null)));
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
}
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
}
@@ -70,11 +70,13 @@
* @param out
*/
@RequestMapping(value = "setShareGoods", method = RequestMethod.GET)
- public void setShareGoods(String callback, AcceptData acceptData, String ids, PrintWriter out) {
+ public void setShareGoods(String callback, AcceptData acceptData, String ids, String day, PrintWriter out) {
// 澶ф窐瀹㈡暟鎹紝鏇存柊
JSONArray array = JSONArray.fromObject(ids);
- String day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ if (StringUtil.isNullOrEmpty(day)) {
+ day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ }
int count = 0;
for (int i = 0; i < array.size(); i++) {
// 鑾峰彇鍟嗗搧璇︽儏
@@ -108,7 +110,12 @@
*/
@RequestMapping(value = "listSelectedGoods", method = RequestMethod.GET)
public void listSelectedGoods(String callback, AcceptData acceptData, String day, PrintWriter out) {
- List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day);
+ if (StringUtil.isNullOrEmpty(day)) {
+ day = TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd");
+ }
+
+ // 鏈�澶�30涓晢鍝�
+ List<ShareHotGoods> listGoods = shareHotGoodsService.listByDay(day, 30);
BigDecimal rate = hongBaoManageService.getFanLiRate();
JSONArray array = new JSONArray();
for (ShareHotGoods sh : listGoods) {
--
Gitblit v1.8.0