From 57b80e02ce56e3cacff75ba789fc633ab46b911a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 04 十二月 2018 15:22:25 +0800
Subject: [PATCH] 去除老版本收藏
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 333 ++++++++++++++++++++++++++----------------------------
1 files changed, 161 insertions(+), 172 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 9549a48..2b762de 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
@@ -6,12 +6,11 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -19,13 +18,13 @@
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.bus.user.CollectionGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
+import com.yeshi.fanli.goods.CollectionGoodsV2;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.SystemService;
-import com.yeshi.fanli.service.inter.goods.CollectionGoodsService;
+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;
@@ -39,12 +38,13 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/apph5/v1/quality")
-public class AppH5QualityGoodsController {
+public class AppH5QualityGoodsController {
@Resource
private LabelService labelService;
@@ -66,25 +66,22 @@
@Resource
private MergeClassService mergeClassService;
-
+
@Resource
private TaoBaoClassService taoBaoClassService;
-
+
@Resource
private SystemService systemService;
@Resource
private QualityGoodsService qualityGoodsService;
-
+
@Resource
private QualityFlashSaleService qualityFlashSaleService;
-
+
@Resource
- private CollectionGoodsService collectionGoodsService;
-
-
-
-
+ private CollectionGoodsV2Service collectionGoodsV2Service;
+
/**
* 9.9鍟嗗搧
*
@@ -95,7 +92,6 @@
public void get9k9(String callback, Integer page, Long mcid, PrintWriter out) {
get9k9ClassGoods("9.9", callback, page, mcid, out);
}
-
/**
* 19.9鍟嗗搧
@@ -130,13 +126,15 @@
get9k9ClassGoods("49.9", callback, page, mcid, out);
}
-
/**
- * 9k9绫诲瀷鐨勫晢鍝佹煡璇�
- * @param labName 鏍囩鍚嶇О
+ * 9k9绫诲瀷鐨勫晢鍝佹煡璇�
+ *
+ * @param labName
+ * 鏍囩鍚嶇О
* @param callback
* @param page
- * @param mcid 瀵瑰簲绫荤洰id
+ * @param mcid
+ * 瀵瑰簲绫荤洰id
* @param out
*/
public void get9k9ClassGoods(String labName, String callback, Integer page, Long mcid, PrintWriter out) {
@@ -148,14 +146,14 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
Long labId = labs.get(0).getId();
if (page == null)
page = 1;
int pageSize = Constant.PAGE_SIZE;
-
+
JSONObject jsonGoods = queryGoodsSmallAmount(page, pageSize, mcid, labId);
if (jsonGoods == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
@@ -173,7 +171,7 @@
}
}
}
-
+
/**
* 鑾峰彇鍟嗗搧
*
@@ -196,7 +194,8 @@
}
// 鏍规嵁鏍囩id 鏌ヨ鏁版嵁
- List<QualityFactory> listQuery = qualityGoodsService.listQuerySmallAmount((page - 1) * pageSize, pageSize, null, labId, mergeCids);
+ List<QualityFactory> listQuery = qualityGoodsService.listQuerySmallAmount((page - 1) * pageSize, pageSize, null,
+ labId, mergeCids);
// 鎬绘潯鏁�
long count = qualityGoodsService.countQuerySmallAmount(null, labId, mergeCids);
@@ -205,7 +204,8 @@
}
JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
@@ -227,8 +227,8 @@
} else {
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
-
- // 鏀瑰彉鍥剧墖灏哄
+
+ // 鏀瑰彉鍥剧墖灏哄
String pictUrl = taoBaoGoodsBrief.getPictUrl();
if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
@@ -244,11 +244,7 @@
return data;
}
-
-
-
-
-
+
/**
* 9.9鍟嗗搧-姣忔棩蹇呮姠
*
@@ -293,9 +289,9 @@
get9k9ClassToDayRob("49.9", callback, page, mcid, out, 1.0, 50.0);
}
-
/**
* 9k9绫诲瀷鍟嗗搧瀵瑰簲鐨勬瘡鏃ュ繀鎶�
+ *
* @param labName
* @param callback
* @param page
@@ -334,8 +330,7 @@
}
}
}
-
-
+
/**
* 姣忔棩蹇呮姠
*
@@ -345,32 +340,35 @@
* @return
* @throws Exception
*/
- public JSONObject queryEverydayRob(Integer page, Long labId, int sortField, Double startCouponAmount, Double endCouponAmount) throws Exception {
+ public JSONObject queryEverydayRob(Integer page, Long labId, int sortField, Double startCouponAmount,
+ Double endCouponAmount) throws Exception {
if (page == null)
page = 1;
int pageSize = Constant.PAGE_SIZE;
-
-
- if (page > 3 ) {
+
+ if (page > 3) {
return null;// 20 鏉′竴椤佃姹傚埌3椤电粨鏉熶粖鏃ユ柊鍝�
}
-
- // 鏍规嵁鏍囩id 鏌ヨ鏁版嵁
- List<QualityFactory> listQuery = qualityGoodsService.listQueryEverydayRob((page - 1) * pageSize, pageSize, null, labId, sortField, startCouponAmount, endCouponAmount);
- // 鍙彇鍓�50鏉℃暟
+ // 鏍规嵁鏍囩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);
+
+ // 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();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
@@ -392,13 +390,13 @@
} 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, fcRate, null)));
}
@@ -409,7 +407,6 @@
return data;
}
-
/**
* 鍝佺墝璐� 锛堝畼鏂规帹鑽愩�愬搧鐗屽埜銆戞帴鍙ｏ級
@@ -440,19 +437,18 @@
page = 1;
int pageSize = Constant.PAGE_SIZE;
-
+
JSONObject jsonObject = taoKeGoodsService.getBrandsGoods(materialId, page, pageSize);
if (jsonObject == null) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
-
-
- JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult(jsonObject));
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(jsonObject));
} catch (Exception e) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -460,7 +456,7 @@
}
}
}
-
+
/**
* 鍝佺墝璐� 锛堝畼鏂规帹鑽愩�愬搧鐗屽埜銆戞帴鍙ｏ級
*
@@ -490,19 +486,18 @@
page = 1;
int pageSize = Constant.PAGE_SIZE;
-
+
JSONObject jsonObject = taoKeGoodsService.getBrandsShops(materialId, page, pageSize);
if (jsonObject == null) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
-
-
- JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult(jsonObject));
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(jsonObject));
} catch (Exception e) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -570,7 +565,8 @@
try {
- List<TaobaoMeterial> taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperNameCache(null, "鏈夊ソ璐�");
+ List<TaobaoMeterial> taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperNameCache(null,
+ "鏈夊ソ璐�");
if (taobaoMeterials == null || taobaoMeterials.size() == 0) {
out.print(JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -606,13 +602,13 @@
}
}
}
-
-
+
/**
* 浠婃棩鏂板搧銆愶紙瀹樻柟鎺ㄨ崘銆愬ソ鍒哥洿鎾�戞帴鍙ｏ級
*
* @param page
- * @param subName 瀛愮被鍚嶇О
+ * @param subName
+ * 瀛愮被鍚嶇О
*/
@RequestMapping(value = "todayNew")
public void todayNew(String callback, Integer page, String subName, String uid, PrintWriter out) {
@@ -638,16 +634,16 @@
int pageSize = Constant.PAGE_SIZE;
-
List<TaoBaoGoodsBrief> listMaterial = taoKeGoodsService.listByMaterial(materialId, page, pageSize);
if (listMaterial == null || listMaterial.size() == 0) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult(2,"娌℃湁鏇村浜�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
@@ -655,7 +651,7 @@
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (TaoBaoGoodsBrief taoBaoGoodsBrief : listMaterial) {
-
+
int biz30day = taoBaoGoodsBrief.getBiz30day();
if (biz30day >= 10000) {
double sales = biz30day;
@@ -664,25 +660,26 @@
} else {
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
-
- // 鏀瑰彉鍥剧墖灏哄 澶у浘鏇存竻鏅�
+
+ // 鏀瑰彉鍥剧墖灏哄 澶у浘鏇存竻鏅�
String pictUrl = taoBaoGoodsBrief.getPictUrl();
pictUrl = pictUrl.replaceAll("320x320", "640x640");
taoBaoGoodsBrief.setPictUrl(pictUrl);
-
+
int collected = 0;
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
- CollectionGoods collectionGoods = collectionGoodsService.findByUidAndAuctionId(Long.parseLong(uid),
- taoBaoGoodsBrief.getAuctionId());
+ CollectionGoodsV2 collectionGoods = collectionGoodsV2Service
+ .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId());
if (collectionGoods != null) {
collected = 1;
}
}
-
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, proportion, fcRate, null);
+
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief,
+ proportion, fcRate, null);
taoBaoGoodsBriefExtra.setCollected(collected);
-
+
array.add(gson.toJson(taoBaoGoodsBriefExtra));
}
@@ -690,11 +687,10 @@
data.put("result_list", array);
data.put("count", 1000);
-
- JsonUtil.printMode(out, callback,JsonUtil.loadTrueResult(data));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- JsonUtil.printMode(out, callback,JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -703,9 +699,6 @@
}
}
-
-
-
/**
* 娼搧鐑崠锛堝畼鏂规帹鑽愪腑鐨勩�愭疆娴佽寖銆戯級
*
@@ -717,8 +710,8 @@
try {
-
- List<TaobaoMeterial> taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperNameCache(null, "娼祦鑼�");
+ List<TaobaoMeterial> taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperNameCache(null,
+ "娼祦鑼�");
if (taobaoMeterials == null || taobaoMeterials.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -735,7 +728,7 @@
if (page == null) {
page = 1;
}
-
+
int pageSize = Constant.PAGE_SIZE;
JSONObject jsonObject = queryMaterialGoods(page, pageSize, materialId);
@@ -768,8 +761,9 @@
public void getPregnantBaby(AcceptData acceptData, String callback, Integer page, String subName, PrintWriter out) {
try {
-
- List<TaobaoMeterial> taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperNameCache(subName, "姣嶅┐涓婚");
+
+ List<TaobaoMeterial> taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperNameCache(subName,
+ "姣嶅┐涓婚");
if (taobaoMeterials == null || taobaoMeterials.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -825,7 +819,8 @@
}
JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
@@ -842,8 +837,8 @@
} else {
taoBaoGoodsBrief.setSalesCount(biz30day + "");
}
-
- // 鏀瑰彉鍥剧墖灏哄
+
+ // 鏀瑰彉鍥剧墖灏哄
String pictUrl = taoBaoGoodsBrief.getPictUrl();
if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
taoBaoGoodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl));
@@ -860,42 +855,42 @@
}
-
-
/**
* 闄愭椂鎶㈣喘
+ *
* @param callback
* @param page
* @param out
*/
@RequestMapping("getFlashSale")
public void getFlashSale(String callback, Integer page, PrintWriter out) {
-
+
if (page == null)
page = 1;
-
+
int pageSize = Constant.PAGE_SIZE;
int type = qualityFlashSaleService.getNowType();
-
+
List<QualityFactory> listQuery = qualityGoodsService.listQueryByFlashSale((page - 1) * pageSize, pageSize);
-
- //绮鹃�夊簱鏁版嵁涓虹┖
+
+ // 绮鹃�夊簱鏁版嵁涓虹┖
if (listQuery == null || listQuery.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
-
+
long count = 3000;
-
- // 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
+
+ // 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
-
- //閬嶅巻鍒楄〃鏁版嵁
+
+ // 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory quality : listQuery) {
TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
@@ -912,13 +907,13 @@
} 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, fcRate, null)));
}
@@ -926,13 +921,13 @@
data.put("count", count);
data.put("type", type);
data.put("result_list", array);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
/**
* 澶ч鍒革紙鍒搁潰鍊艰寖鍥达級
+ *
* @param callback
* @param amount
* @param page
@@ -940,17 +935,15 @@
*/
@RequestMapping("choiceCouponAmount")
public void choiceCouponAmount(String callback, Integer amount, Integer page, PrintWriter out) {
-
-
+
if (page == null)
page = 1;
-
+
int pageSize = Constant.PAGE_SIZE;
-
-
+
Integer startAmount = null;
- Integer endAmount = null ;
-
+ Integer endAmount = null;
+
if (amount.equals(1)) {
startAmount = 5;
endAmount = 10;
@@ -963,29 +956,29 @@
} else if (amount.equals(4)) {
startAmount = 50;
}
-
+
Integer startPropor = 20;
-
- List<QualityFactory> listQuery = qualityGoodsService.listQueryByCouponAmount((page - 1) * pageSize,
- pageSize, startAmount, endAmount, startPropor);
-
+
+ List<QualityFactory> listQuery = qualityGoodsService.listQueryByCouponAmount((page - 1) * pageSize, pageSize,
+ startAmount, endAmount, startPropor);
+
if (listQuery == null || listQuery.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
-
-
+
long count = qualityGoodsService.countQueryByCouponAmount(startAmount, endAmount, startPropor);
-
- // 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
+
+ // 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
-
- //閬嶅巻鍒楄〃鏁版嵁
+
+ // 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory selectionGoods : listQuery) {
TaoBaoGoodsBrief taoBaoGoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
@@ -1002,13 +995,13 @@
} 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, fcRate, null)));
}
@@ -1017,11 +1010,10 @@
data.put("result", array);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
-
-
+
/**
* 瓒呴珮濂栭噾
+ *
* @param callback
* @param page
* @param type
@@ -1029,16 +1021,15 @@
*/
@RequestMapping("choiceRebate")
public void choiceRebate(String callback, Integer page, Integer type, PrintWriter out) {
-
+
if (page == null)
page = 1;
-
+
int pageSize = Constant.PAGE_SIZE;
-
-
+
Integer startAmount = null;
- Integer endAmount = null ;
-
+ Integer endAmount = null;
+
if (type.equals(1)) {
startAmount = 1;
endAmount = 5;
@@ -1051,30 +1042,29 @@
} else if (type.equals(4)) {
startAmount = 15;
}
-
+
double tkRate = 20.00;
-
+
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
-
+
List<QualityFactory> listQuery = qualityGoodsService.listQueryByRebateAmount((page - 1) * pageSize, pageSize,
proportion, startAmount, endAmount, tkRate);
-
+
if (listQuery == null || listQuery.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "娌℃湁鏇村浜�"));
return;
}
-
-
- long count = qualityGoodsService.countQueryByRebateAmount(proportion, startAmount, endAmount, tkRate);
-
- // 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
- JSONArray array = new JSONArray();
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
- //閬嶅巻鍒楄〃鏁版嵁
+ long count = qualityGoodsService.countQueryByRebateAmount(proportion, startAmount, endAmount, tkRate);
+
+ // 绮鹃�夊簱鏁版嵁澶勭悊杩斿洖 鍓嶇
+ JSONArray array = new JSONArray();
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
+ // 閬嶅巻鍒楄〃鏁版嵁
for (QualityFactory quality : listQuery) {
TaoBaoGoodsBrief taoBaoGoodsBrief = quality.getTaoBaoGoodsBrief();
@@ -1091,25 +1081,26 @@
} 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, fcRate, null)));
}
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", array);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
+
/**
* 瓒呴珮濂栭噾
+ *
* @param callback
* @param page
* @param type
@@ -1117,31 +1108,29 @@
*/
@RequestMapping("recommendToIndex")
public void recommendToIndex(String callback, Integer page, PrintWriter out) {
-
+
if (page == null)
page = 1;
-
+
int pageSize = Constant.PAGE_SIZE;
-
-
+
Map<String, String> map = manageService.convertMap();
String proportion = map.get("hongbao_goods_proportion");
String fcRate = map.get("hongbao_fc_ratio");
-
- JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize,
- proportion, fcRate);
-
+
+ JSONArray array = qualityGoodsService.getRecommendToIndex((page - 1) * pageSize, pageSize, proportion, fcRate);
+
if (array == null) {
out.print(JsonUtil.loadFalseResult("娌℃湁鏇村浜�"));
return;
}
-
+
long count = qualityGoodsService.countRecommendToIndex(proportion);
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", array);
-
+
out.print(JsonUtil.loadTrueResult(data));
return;
}
--
Gitblit v1.8.0