From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 428 +++++++++++++++++++++++++----------------------------
1 files changed, 203 insertions(+), 225 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 4e8981c..e846055 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
@@ -16,14 +16,15 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.lable.Label;
import com.yeshi.fanli.entity.bus.lable.MergeClass;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -31,16 +32,20 @@
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.service.inter.lable.MergeClassService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
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.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
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,6 +61,9 @@
@Resource
private QualityFactoryService selectionGoodsService;
+
+ @Resource
+ private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
private TaobaoMeterialService taobaoMeterialService;
@@ -86,10 +94,15 @@
@Resource
private HongBaoManageService hongBaoManageService;
-
+
@Resource
private ConfigService configService;
-
+
+ @Resource
+ private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
+
+ @Resource
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
/**
* 9.9鍟嗗搧
@@ -99,7 +112,8 @@
*/
@RequestMapping(value = "get9k9")
public void get9k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods("9.9", callback, page, mcid, out);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(209.9), new BigDecimal(0), new BigDecimal(9.9), mcid);
+
}
/**
@@ -110,7 +124,9 @@
*/
@RequestMapping(value = "get19k9")
public void get19k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods("19.9", callback, page, mcid, out);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(319.9), new BigDecimal(9.9), new BigDecimal(19.9),
+ mcid);
+
}
/**
@@ -121,7 +137,9 @@
*/
@RequestMapping(value = "get29k9")
public void get29k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods("29.9", callback, page, mcid, out);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(429.9), new BigDecimal(19.9), new BigDecimal(29.9),
+ mcid);
+
}
/**
@@ -132,7 +150,8 @@
*/
@RequestMapping(value = "get49k9")
public void get49k9(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassGoods("49.9", callback, page, mcid, out);
+ get9k9ClassGoods(callback, out, page, 500, new BigDecimal(549.9), new BigDecimal(29.9), new BigDecimal(49.9),
+ mcid);
}
/**
@@ -146,110 +165,76 @@
* 瀵瑰簲绫荤洰id
* @param out
*/
- public void get9k9ClassGoods(String labName, String callback, Integer page, Long mcid, PrintWriter out) {
-
+ public void get9k9ClassGoods(String callback, PrintWriter out, Integer page, Integer biz30day, BigDecimal zkPrice,
+ BigDecimal minQuanPrice, BigDecimal maxQuanPrice, Long mcid) {
try {
-
- List<Label> labs = labelService.selectByTitleCache("labKey", labName);
- if (labs == null || labs.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- Long labId = labs.get(0).getId();
-
- if (page == null)
+ if (page == null || page <= 0) {
page = 1;
+ }
int pageSize = Constant.PAGE_SIZE;
- JSONObject jsonGoods = queryGoodsSmallAmount(page, pageSize, mcid, labId);
- if (jsonGoods == null) {
+ String mergeCids = null;
+ if (mcid != null && (!mcid.equals(0) || mcid != 0)) {
+ MergeClass mergeClass = mergeClassService.selectByPrimaryKeyCache(mcid);
+ if (mergeClass != null) {
+ // 鍒嗙被id,闅斿紑
+ mergeCids = mergeClass.getMergeCids();
+ }
+ }
+
+ // 鏍规嵁鏍囩id 鏌ヨ鏁版嵁
+ 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;
}
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(jsonGoods));
+ // 鎬绘潯鏁�
+ long count = qualityGoodsService.count9k9ClassGoods(biz30day, zkPrice, minQuanPrice, maxQuanPrice,
+ mergeCids);
+ JSONArray array = new JSONArray();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
+ /* 閬嶅巻鍒楄〃鏁版嵁 */
+ for (QualityFactory selectionGoods : listQuery) {
+ TaoBaoGoodsBrief goodsBrief = selectionGoods.getTaoBaoGoodsBrief();
+ if (goodsBrief == null) {
+ continue;
+ }
+ 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.add(new BigDecimal("0.1")));
+ List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsActivityService.listByPrice(minQuanPrice,
+ maxQuanPrice.add(new BigDecimal("0.1")), page, pageSize);
+ if (goodsList != null) {
+ array.clear();
+ 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);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
- }
-
- /**
- * 鑾峰彇鍟嗗搧
- *
- * @param page
- * @param pageSize
- * @param labIds
- * @return
- * @throws Exception
- */
- public JSONObject queryGoodsSmallAmount(int page, int pageSize, Long mcid, Long labId) throws Exception {
-
- String mergeCids = null;
- if (mcid != null && (!mcid.equals(0) || mcid != 0)) {
-
- MergeClass mergeClass = mergeClassService.selectByPrimaryKeyCache(mcid);
- if (mergeClass != null) {
- // 鍒嗙被id,闅斿紑
- mergeCids = mergeClass.getMergeCids();
- }
- }
-
- // 鏍规嵁鏍囩id 鏌ヨ鏁版嵁
- List<QualityFactory> listQuery = qualityGoodsService.listQuerySmallAmount((page - 1) * pageSize, pageSize, null,
- labId, mergeCids);
-
- // 鎬绘潯鏁�
- long count = qualityGoodsService.countQuerySmallAmount(null, labId, mergeCids);
- if (listQuery == null || listQuery.size() == 0) {
- return null;
- }
-
- JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
- /* 閬嶅巻鍒楄〃鏁版嵁 */
- for (QualityFactory selectionGoods : listQuery) {
-
- TaoBaoGoodsBrief taoBaoGoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
-
- if (taoBaoGoodsBrief == null) {
- continue;
- }
-
- int biz30day = taoBaoGoodsBrief.getBiz30day();
- if (biz30day >= 10000) {
- double sales = biz30day;
- String salesCountMidea = String.format("%.1f", sales / 10000);
- taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
- } else {
- taoBaoGoodsBrief.setSalesCount(biz30day + "");
- }
-
- // 鏀瑰彉鍥剧墖灏哄
- String pictUrl = taoBaoGoodsBrief.getPictUrl();
- if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
- taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
- }
-
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
- }
-
- JSONObject data = new JSONObject();
-
- data.put("count", count);
- data.put("result_list", array);
-
- return data;
}
/**
@@ -260,7 +245,8 @@
*/
@RequestMapping(value = "get9k9EverydayRob")
public void get9k9EverydayRob(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassToDayRob("9.9", callback, page, mcid, out, 1.0, 50.0);
+ queryEverydayRob(callback, out, page, new BigDecimal(209.9), new BigDecimal(0), new BigDecimal(9.9));
+
}
/**
@@ -271,7 +257,7 @@
*/
@RequestMapping(value = "get19k9EverydayRob")
public void get19k9EverydayRob(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassToDayRob("19.9", callback, page, mcid, out, 1.0, 50.0);
+ queryEverydayRob(callback, out, page, new BigDecimal(319.9), new BigDecimal(9.9), new BigDecimal(19.9));
}
/**
@@ -282,7 +268,8 @@
*/
@RequestMapping(value = "get29k9EverydayRob")
public void get29k9EverydayRob(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassToDayRob("29.9", callback, page, mcid, out, 1.0, 50.0);
+ queryEverydayRob(callback, out, page, new BigDecimal(429.9), new BigDecimal(19.9), new BigDecimal(29.9));
+
}
/**
@@ -293,49 +280,8 @@
*/
@RequestMapping(value = "get49k9EverydayRob")
public void get49k9EverydayRob(String callback, Integer page, Long mcid, PrintWriter out) {
- get9k9ClassToDayRob("49.9", callback, page, mcid, out, 1.0, 50.0);
- }
+ queryEverydayRob(callback, out, page, new BigDecimal(549.9), new BigDecimal(29.9), new BigDecimal(49.9));
- /**
- * 9k9绫诲瀷鍟嗗搧瀵瑰簲鐨勬瘡鏃ュ繀鎶�
- *
- * @param labName
- * @param callback
- * @param page
- * @param mcid
- * @param out
- * @param startCouponAmount
- * @param endCouponAmount
- */
- public void get9k9ClassToDayRob(String labName, String callback, Integer page, Long mcid, PrintWriter out,
- Double startCouponAmount, Double endCouponAmount) {
-
- try {
-
- List<Label> labs = labelService.selectByTitleCache("labKey", labName);
- if (labs == null || labs.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- Long labId = labs.get(0).getId();
- JSONObject jsonGoods = queryEverydayRob(page, labId, 2, startCouponAmount, endCouponAmount);
-
- if (jsonGoods == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
- return;
- }
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(jsonGoods));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e1) {
- e1.printStackTrace();
- }
- }
}
/**
@@ -347,70 +293,56 @@
* @return
* @throws Exception
*/
- public JSONObject queryEverydayRob(Integer page, Long labId, int sortField, Double startCouponAmount,
- Double endCouponAmount) throws Exception {
+ public void queryEverydayRob(String callback, PrintWriter out, Integer page, BigDecimal zkPrice,
+ BigDecimal minQuanPrice, BigDecimal maxQuanPrice) {
if (page == null)
page = 1;
- int pageSize = Constant.PAGE_SIZE;
-
+ // 20 鏉′竴椤佃姹傚埌3椤电粨鏉熶粖鏃ユ柊鍝�
if (page > 3) {
- return null;// 20 鏉′竴椤佃姹傚埌3椤电粨鏉熶粖鏃ユ柊鍝�
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
+ return;
}
- // 鏍规嵁鏍囩id 鏌ヨ鏁版嵁
- List<QualityFactory> listQuery = qualityGoodsService.listQueryEverydayRob((page - 1) * pageSize, pageSize, null,
- labId, sortField, startCouponAmount, endCouponAmount);
-
- // 鍙彇鍓�50鏉℃暟
- long count = 50;
-
- // long count = qualityGoodsService.countQueryEverydayRob(null, labId,
- // startCouponAmount, endCouponAmount);
-
- if (listQuery == null || listQuery.size() == 0) {
- return null;
- }
-
- JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
- BigDecimal proportion = manageService.getFanLiRate();
- /* 閬嶅巻鍒楄〃鏁版嵁 */
- for (QualityFactory selectionGoods : listQuery) {
-
- TaoBaoGoodsBrief taoBaoGoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
-
- if (taoBaoGoodsBrief == null) {
- continue;
+ try {
+ int pageSize = Constant.PAGE_SIZE;
+ List<QualityFactory> listQuery = qualityGoodsService.listQueryEverydayRob((page - 1) * pageSize, pageSize,
+ zkPrice, minQuanPrice, maxQuanPrice);
+ if (listQuery == null || listQuery.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
+ return;
}
- int biz30day = taoBaoGoodsBrief.getBiz30day();
- if (biz30day >= 10000) {
- double sales = biz30day;
- String salesCountMidea = String.format("%.1f", sales / 10000);
- taoBaoGoodsBrief.setSalesCount(salesCountMidea + "涓�");
+ JSONArray array = new JSONArray();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
+ BigDecimal proportion = manageService.getFanLiRate();
+ for (QualityFactory selectionGoods : listQuery) {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
+ if (taoBaoGoodsBrief == null) {
+ continue;
+ }
+ array.add(gson
+ .toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
+ }
+
+ long count = qualityGoodsService.countQueryEverydayRob(zkPrice, minQuanPrice, maxQuanPrice);
+ if (count < 50) {
+ count = listQuery.size();
} else {
- taoBaoGoodsBrief.setSalesCount(biz30day + "");
+ count = 50;
}
- // 鏀瑰彉鍥剧墖灏哄
- String pictUrl = taoBaoGoodsBrief.getPictUrl();
- if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
- taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
- }
-
- array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion.toString(), null)));
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ data.put("result_list", array);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ LogHelper.errorDetailInfo(e);
}
-
- JSONObject data = new JSONObject();
-
- data.put("count", count);
- data.put("result_list", array);
-
- return data;
}
/**
@@ -650,7 +582,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) {
@@ -673,7 +605,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service
- .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId());
+ .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId(),Constant.SOURCE_TYPE_TAOBAO);
if (collectionGoods != null) {
collected = 1;
}
@@ -864,13 +796,25 @@
* @param out
*/
@RequestMapping("getFlashSale")
- public void getFlashSale(String callback, Integer page, PrintWriter out) {
+ public void getFlashSale(String callback, Integer page, Long auctionId, PrintWriter out) {
if (page == null)
page = 1;
int pageSize = Constant.PAGE_SIZE;
int type = qualityFlashSaleService.getNowType();
+
+ TaoBaoGoodsBrief goodsBrief = null;
+ if (page == 1 && auctionId != null) {
+ List<TaoBaoGoodsBrief> list = taoBaoGoodsBriefService.queryByAuctionId(auctionId);
+ if (list != null && list.size() > 0) {
+ goodsBrief = list.get(0);
+ }
+ }
+
+ if (goodsBrief != null) {
+ pageSize = pageSize - 1;
+ }
List<QualityFactory> listQuery = qualityGoodsService.listQueryByFlashSale((page - 1) * pageSize, pageSize);
@@ -889,12 +833,19 @@
BigDecimal proportion = manageService.getFanLiRate();
+ if (goodsBrief != null) {
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null)));
+ }
+
// 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory quality : listQuery) {
TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
-
if (taoBaoGoodsBrief == null) {
+ continue;
+ }
+
+ if (goodsBrief != null && auctionId.equals(taoBaoGoodsBrief.getAuctionId())) {
continue;
}
@@ -921,6 +872,40 @@
data.put("type", type);
data.put("result_list", array);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+ @RequestMapping("getFlashSaleNew")
+ public void getFlashSaleNew(String callback, Integer page, Long auctionId, String time, PrintWriter out) {
+ List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(time);
+ if (detailList0 == null)
+ detailList0 = new ArrayList<>();
+ List<DaTaoKeDetailV2> detailList = new ArrayList<>();
+ detailList.addAll(detailList0);
+ JSONArray array = new JSONArray();
+ if (page == 1) {
+ if (auctionId != null && detailList != null)
+ for (int i = 0; i < detailList.size(); i++) {
+ if (detailList.get(i).getGoodsId().longValue() == auctionId) {
+ DaTaoKeDetailV2 goods = detailList.get(i);
+ detailList.remove(i);
+ detailList.add(0, goods);
+ break;
+ }
+ }
+
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ if (detailList != null)
+ for (DaTaoKeDetailV2 detail : detailList) {
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail),
+ hongBaoManageService.getFanLiRate() + "", null)));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", detailList.size());
+ data.put("result_list", array);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
@@ -1050,7 +1035,8 @@
return;
}
- long count = qualityGoodsService.countQueryByRebateAmount(proportion.toString(), startAmount, endAmount, tkRate);
+ long count = qualityGoodsService.countQueryByRebateAmount(proportion.toString(), startAmount, endAmount,
+ tkRate);
// 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
JSONArray array = new JSONArray();
@@ -1108,7 +1094,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("娌℃湁鏇村浜�"));
@@ -1124,7 +1111,7 @@
out.print(JsonUtil.loadTrueResult(data));
return;
}
-
+
/**
* 瓒呴珮濂栭噾
*
@@ -1135,18 +1122,13 @@
*/
@RequestMapping("freeGoods")
public void freeGoods(String callback, Integer page, PrintWriter out) {
-
- if (page == null || page < 1)
- page = 1;
-
- int pageSize = Constant.PAGE_SIZE;
-
- double tkRate = 20;
- String lableName = "9.9";
-
try {
- List<QualityFactory> listQuery = qualityGoodsService.listFreeGoods((page - 1) * pageSize, pageSize, tkRate,
- lableName);
+ 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, "娌℃湁鏇村浜�"));
return;
@@ -1209,7 +1191,7 @@
continue; // 鍒稿悗浠峰ぇ浜�10
}
- TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
proportion.toString(), null);
// 灏嗚繑鍒╂敼涓哄埜鍚庝环
TaoBaoHongBaoInfo taoBaoHongBaoInfo = extra.getTaoBaoHongBaoInfo();
@@ -1217,30 +1199,26 @@
taoBaoHongBaoInfo.setHongbao(extra.getQuanPrice());
taoBaoHongBaoInfo.setRate("楼" + extra.getQuanPrice());
}
-
+
array.add(gson.toJson(extra));
}
- long count = qualityGoodsService.countFreeGoods(tkRate, lableName);
+ long count = qualityGoodsService.countFreeGoods();
-
JSONObject data = new JSONObject();
if (page == 1) {
// 鎶藉瑙勫垯
- String rules = configService.get("free_goods_rule");
+ String rules = configService.get(ConfigKeyEnum.freeGoodsRule.getKey());
data.put("ruleLink", rules);
}
-
+
data.put("count", count);
data.put("result_list", array);
-
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏁版嵁鏆傛湭鎻愪緵"));
+ LogHelper.errorDetailInfo(e);
}
}
-
+
}
--
Gitblit v1.8.0