From 4d7db6fd66f5b2c9cae9954e46314f9711ce1e8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 十一月 2019 18:51:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/BrandControllerV2.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..6352fe1 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
@@ -349,7 +349,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getList", method = RequestMethod.POST)
+// @RequestMapping(value = "getList", method = RequestMethod.POST)
public void getList(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
@@ -391,7 +391,7 @@
* @param acceptData
* @param out
*/
- @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
+// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV2(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
if (id == null) {
@@ -550,7 +550,7 @@
* 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
- @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
+// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV2(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
@@ -622,7 +622,7 @@
* @param acceptData
* @param out
*/
-// @RequestMapping(value = "getList", method = RequestMethod.POST)
+ @RequestMapping(value = "getList", method = RequestMethod.POST)
public void getListV3(AcceptData acceptData, Integer page, Long cid, Long uid, PrintWriter out) {
if (page == null || page < 1) {
out.print(JsonUtil.loadFalseResult("椤电爜涓嶆纭�"));
@@ -665,7 +665,7 @@
* @param acceptData
* @param out
*/
-// @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
+ @RequestMapping(value = "getShopInfoV2", method = RequestMethod.POST)
public void getShopInfoV3(AcceptData acceptData, Integer page, Long id, Long uid, PrintWriter out) {
if (id == null) {
out.print(JsonUtil.loadFalseResult("缂哄け搴楅摵id"));
@@ -681,8 +681,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();
@@ -738,7 +740,7 @@
* 绮鹃��1锛� 瓒宠抗鍒楄〃2
* @param out
*/
-// @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
+ @RequestMapping(value = "getHistoryV2", method = RequestMethod.POST)
public void getHistoryV3(AcceptData acceptData, Integer page, Long uid, Integer type, PrintWriter out) {
if (type == null) {
out.print(JsonUtil.loadFalseResult("绫诲瀷涓嶆纭�"));
--
Gitblit v1.8.0