bug

jiangqs

2023-09-11 3adbcc42d5f84c3c83d220543189361add81e04d

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

@@ -1,5 +1,7 @@
package com.ruoyi.order.controller.concole;

import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
@@ -7,10 +9,7 @@
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.vo.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -62,6 +61,7 @@
        mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
        mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
        mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
        mgtBulletinBoardVo.setActivityUserTotal(mgtBulletinBoardVoOrder.getActivityUserTotal());
        return R.ok(mgtBulletinBoardVo);
    }

@@ -155,4 +155,24 @@
        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);
    }


    @GetMapping("/queryBill")
    public R<ProfitSharingResult> queryBill(String orderId) throws WxPayException {
        ProfitSharingResult result = orderService.queryBill(orderId);
        return R.ok(result);
    }
}