bug

jiangqs

2023-08-29 1695aa136a89421b1cff75d672888e81d2a24d9a

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java

@@ -62,6 +62,7 @@
        mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
        mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
        mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
        mgtBulletinBoardVo.setActivityUserTotal(mgtBulletinBoardVoOrder.getActivityUserTotal());
        return R.ok(mgtBulletinBoardVo);
    }

@@ -155,4 +156,18 @@
        AgencyTotalVo agencyTotalVo= orderService.getAgencyTotalVo(shopIdList);
        return R.ok(agencyTotalVo);
    }

    /**
     * @description  获取用户统计
     * @author  jqs
     * @date    2023/8/29 17:38
     * @param merBaseDto
     * @return  R<MerMemberSimpleTotalVo>
     */
    @PostMapping("/getMerMemberSimpleTotalVo")
    public R<MerMemberSimpleTotalVo> getMerMemberSimpleTotalVo(@RequestBody MerBaseDto merBaseDto){
        MerMemberSimpleTotalVo memberSimpleTotalVo= orderService.getMerMemberSimpleTotalVo(merBaseDto);
        return R.ok(memberSimpleTotalVo);
    }

}