From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java
index 71b247b..661a30b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ElmeController.java
@@ -11,13 +11,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
-import com.aliyuncs.unmarshaller.JsonUnmashaller;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.elme.ElmeHongBaoOrderMap;
import com.yeshi.fanli.entity.elme.ElmeOrder;
import com.yeshi.fanli.service.inter.elme.ElmeHongBaoOrderMapService;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.elme.ElmeUserOrderVO;
@@ -48,7 +46,7 @@
@RequestMapping("getOrderList")
public void getOrderList(AcceptData acceptData, Long uid, int page, String callback, PrintWriter out) {
List<ElmeUserOrderVO> voList = new ArrayList<>();
- List<ElmeHongBaoOrderMap> list = elmeHongBaoOrderMapService.listByHongBaoUid(uid, page, Constant.PAGE_SIZE);
+ List<ElmeHongBaoOrderMap> list = elmeHongBaoOrderMapService.listByHongBaoUid(uid, page, 3);
if (list != null)
for (ElmeHongBaoOrderMap map : list)
voList.add(create(map));
--
Gitblit v1.8.0