puzhibing
2024-01-24 a2b83e708f265bf80e8c448cd4c3ca3dc09216d8
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -55,9 +55,9 @@
    * @date 2023/6/18 17:30
    */
    @PostMapping("/boardOrderTotal")
    public R<MgtBulletinBoardVo> boardOrderTotal(){
    public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody List<Long> userIds){
        MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
        MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal();
        MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal(userIds);
        mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
        mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
        mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
@@ -171,8 +171,19 @@
    @GetMapping("/queryBill")
    public R<ProfitSharingResult> queryBill(String transactionId,String outOrderNo) throws WxPayException {
        ProfitSharingResult result = orderService.queryBill(transactionId,outOrderNo);
    public R<ProfitSharingResult> queryBill(String orderId) throws WxPayException {
        ProfitSharingResult result = orderService.queryBill(orderId);
        return R.ok(result);
    }
    /**
     * 获取活动订单商品id
     * @param activityId
     * @return
     */
    @PostMapping("/getActivityOrderGoods")
    public R<List<String>> getActivityOrderGoods(@RequestBody String activityId){
        List<String> activityOrderGoods = orderService.getActivityOrderGoods(activityId);
        return R.ok(activityOrderGoods);
    }
}