商户端会员统计

jiangqs

2023-07-03 acfa230addbde3212790a3e6ccd6741eaac00b46

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -75,6 +75,15 @@
        return R.ok(merVerifyOrderVo);
    }

    @RequestMapping(value = "/sureVerifyCoupon", method = RequestMethod.POST)
    @ApiOperation(value = "核销优惠券")
    public R<MerVerifyCouponVo> sureVerifyCoupon(@RequestBody MerVerifyCouponDto merVerifyCouponDto) {
        Long userId = SecurityUtils.getUserId();
        merVerifyCouponDto.setUserId(userId);
        MerVerifyCouponVo merVerifyCouponVo = orderService.sureVerifyCoupon(merVerifyCouponDto);
        return R.ok(merVerifyCouponVo);
    }


    @RequestMapping(value = "/pageMerMemberNoClearOrder", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取用户未结清订单")
@@ -110,13 +119,11 @@
    @RequestMapping(value = "/pageMerOrder", method = RequestMethod.POST)
    @ApiOperation(value = "获取商户端订单列表")
    public R<Page<MerOrderPageVo>> pageMerOrder(@RequestBody MerOrderPageDto merOrderPageDto) {
        log.info("merOrderPageDto1----"+merOrderPageDto.toString());
        Long userId = SecurityUtils.getUserId();
        merOrderPageDto.setUserId(userId);
        Page<MerOrderPageVo> page = new Page<>();
        page.setSize(merOrderPageDto.getPageSize());
        page.setCurrent(merOrderPageDto.getPageNum());
        log.info("merOrderPageDto2----"+merOrderPageDto.toString());
        List<MerOrderPageVo> merOrderPageVoList = orderService.pageMerOrder(page,merOrderPageDto);
        return R.ok(page.setRecords(merOrderPageVoList));
    }