记得上下班打卡 | git大法好,push需谨慎

Commit 486bbdc3 authored by 胡佳晨's avatar 胡佳晨

订单列表分页

parent 71c1407a
package com.liquidnet.service.goblin.service; package com.liquidnet.service.goblin.service;
import com.github.pagehelper.PageInfo;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderDetailsVo; import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderDetailsVo;
import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderListVo; import com.liquidnet.service.goblin.dto.vo.GoblinAppOrderListVo;
...@@ -12,7 +13,7 @@ import java.util.List; ...@@ -12,7 +13,7 @@ import java.util.List;
public interface IGoblinOrderAppService { public interface IGoblinOrderAppService {
ResponseDto<List<GoblinAppOrderListVo>> orderList(int page,String pre); ResponseDto<PageInfo<GoblinAppOrderListVo>> orderList(int page, String pre);
ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(String orderMasterCode); ResponseDto<List<GoblinAppOrderListVo>> orderListByMaster(String orderMasterCode);
......
package com.liquidnet.service.goblin.controller; package com.liquidnet.service.goblin.controller;
import com.github.pagehelper.PageInfo;
import com.liquidnet.commons.lang.util.CurrentUtil; import com.liquidnet.commons.lang.util.CurrentUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.base.codec.vo.EncryptedReq; import com.liquidnet.service.base.codec.vo.EncryptedReq;
...@@ -34,7 +35,7 @@ public class GoblinOrderAppController { ...@@ -34,7 +35,7 @@ public class GoblinOrderAppController {
@ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数", example = "1"), @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "page", value = "页数", example = "1"),
@ApiImplicitParam(type = "form", required = false, dataType = "String", name = "pre", value = "活动前缀[ZZ-正在下单|不传为普通订单]", example = "ZZ"), @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "pre", value = "活动前缀[ZZ-正在下单|不传为普通订单]", example = "ZZ"),
}) })
public ResponseDto<List<GoblinAppOrderListVo>> orderList(@RequestParam("page") @Valid int page, public ResponseDto<PageInfo<GoblinAppOrderListVo>> orderList(@RequestParam("page") @Valid int page,
@RequestParam(value = "pre", required = false) String pre) { @RequestParam(value = "pre", required = false) String pre) {
return goblinOrderAppService.orderList(page, pre); return goblinOrderAppService.orderList(page, pre);
} }
......
...@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service.impl; ...@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service.impl;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageInfo;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.liquidnet.commons.lang.util.*; import com.liquidnet.commons.lang.util.*;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
...@@ -46,7 +47,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService { ...@@ -46,7 +47,7 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
@Override @Override
public ResponseDto<List<GoblinAppOrderListVo>> orderList(int page, String pre) { public ResponseDto<PageInfo<GoblinAppOrderListVo>> orderList(int page, String pre) {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
List<GoblinAppOrderListVo> orderVoList = ObjectUtil.goblinAppOrderListVoArrayList(); List<GoblinAppOrderListVo> orderVoList = ObjectUtil.goblinAppOrderListVoArrayList();
List<String> orderIds; List<String> orderIds;
...@@ -77,7 +78,9 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService { ...@@ -77,7 +78,9 @@ public class GoblinOrderAppServiceImpl implements IGoblinOrderAppService {
vo.setOrderSkuVos(skuVos); vo.setOrderSkuVos(skuVos);
orderVoList.add(vo); orderVoList.add(vo);
} }
return ResponseDto.success(orderVoList); PageInfo<GoblinAppOrderListVo> pageInfo = new PageInfo(orderVoList);
pageInfo.setTotal(orderIds.size());
return ResponseDto.success(pageInfo);
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment