联调bug和统计完善

jiangqs

2023-06-30 cbc564a7088503ad8cc7af4e1d2ba417d061e615

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

@@ -2,17 +2,19 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
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 javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;

/**
@@ -66,11 +68,25 @@
     * @author  jqs
     * @date    2023/6/21 15:27
     * @param mgtBasePlatformDto
     * @return  List<MgtMapTotalVo>
     * @return  List<MgtMapIntTotalVo>
     */
    @PostMapping("/listMemberGoodsRank")
    public R<List<MgtMapTotalVo>> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto){
        List<MgtMapTotalVo> memberGoodsRankList = orderService.listMemberGoodsRank(mgtBasePlatformDto);
    public R<List<MgtMapIntTotalVo>> listMemberGoodsRank(@RequestBody MgtBasePlatformDto mgtBasePlatformDto){
        List<MgtMapIntTotalVo> memberGoodsRankList = orderService.listMemberGoodsRank(mgtBasePlatformDto);
        return R.ok(memberGoodsRankList);
    }

    /**
     * @description  获取用户未支付金额
     * @author  jqs
     * @date    2023/6/29 18:00
     * @param merBaseDto
     * @return  R<BigDecimal>
     */
    @PostMapping("/getMemberUnpaidOrder")
    public R<BigDecimal> getMemberUnpaidOrder(@RequestBody MerBaseDto merBaseDto){
        BigDecimal unpaidMoney = orderService.getMemberUnpaidOrder(merBaseDto);
        return R.ok(unpaidMoney);
    }

}