| | |
|---|
| | | import javax.annotation.Resource; |
|---|
| | | import java.util.List; |
|---|
| | | |
|---|
| | | import static org.reflections.Reflections.log; |
|---|
| | | |
|---|
| | | /** |
|---|
| | | * @author jqs34 |
|---|
| | | * @ClassName MerOrderController |
|---|
| | |
|---|
| | | Page<MerMemberNoClearOrderVo> page = new Page<>(); |
|---|
| | | page.setSize(merMemberNoClearOrderDto.getPageSize()); |
|---|
| | | page.setCurrent(merMemberNoClearOrderDto.getPageNum()); |
|---|
| | | log.info("merMemberNoClearOrderDto----"+merMemberNoClearOrderDto.toString()); |
|---|
| | | List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderService.pageMerMemberOrder(page,merMemberNoClearOrderDto); |
|---|
| | | return R.ok(page.setRecords(merMemberNoClearOrderVoList)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | @RequestMapping(value = "/pageMerMemberPayOrder", method = RequestMethod.POST) |
|---|
| | | @ApiOperation(value = "获取商户端用户消费记录") |
|---|
| | | public R<Page<MerOrderPageVo>> pageMerMemberPayOrder(@RequestBody MerMemberNoClearOrderDto merOrderPageDto) { |
|---|
| | | Long userId = SecurityUtils.getUserId(); |
|---|
| | | merOrderPageDto.setUserId(userId); |
|---|
| | | Page<MerOrderPageVo> page = new Page<>(); |
|---|
| | | page.setSize(merOrderPageDto.getPageSize()); |
|---|
| | | page.setCurrent(merOrderPageDto.getPageNum()); |
|---|
| | | List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerMemberPayOrder(page,merOrderPageDto); |
|---|
| | | return R.ok(page.setRecords(merOrderPageVoList)); |
|---|
| | | } |
|---|
| | | |
|---|
| | | } |
|---|
