From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
index 7ea420c..df8b079 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java
@@ -351,6 +351,12 @@
*/
@RequestMapping(value = "getList", method = RequestMethod.POST)
public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
+ if (Constant.IS_TEST) {
+ getListV3(acceptData, page, cid, uid, out);
+ return;
+ }
+
+
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
return;
@@ -393,6 +399,11 @@
*/
@RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
+
+ if (Constant.IS_TEST) {
+ getShopInfoV3(acceptData, page, id, uid, out);
+ return;
+ }
if (id == null) {
out.print(JsonUtil.loadFalseResult("缂哄け搴楅摵id"));
@@ -552,6 +563,11 @@
*/
@RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
+ if (Constant.IS_TEST) {
+ getHistoryV3(acceptData, page, uid, type, out);
+ return;
+ }
+
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
return;
@@ -681,8 +697,10 @@
BigDecimal shareRate = hongBaoManageService.getShareRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+
ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
JSONArray array = new JSONArray();
+
List<BrandGoodsCahe> listGoods = brandGoodsCaheService.getByBrandId((page - 1) * 50, 50,id);
for (BrandGoodsCahe brandGoods: listGoods) {
JDGoods goodsJD = brandGoods.getGoodsJD();
--
Gitblit v1.8.0