bug

jiangqs

2023-09-11 3adbcc42d5f84c3c83d220543189361add81e04d

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

@@ -1,19 +1,15 @@
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;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
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.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 com.ruoyi.system.api.domain.vo.*;
import org.springframework.web.bind.annotation.*;

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

@@ -106,4 +103,76 @@
        consumerGoodsService.sendGoodsGift(giftSendDtoList);
        return R.ok();
    }

    /**
     * @description  自动取消订单
     * @author  jqs
     * @date    2023/7/13 17:15
     * @param orderId
     * @return  R
     */
    @PostMapping("/autoCancelOrder")
    public R autoCancelOrder(@RequestBody String orderId){
        orderService.autoCancelOrder(orderId);
        return R.ok();
    }

    /**
     * @description  销量排行
     * @author  jqs
     * @date    2023/8/24 18:24
     * @param shopIdList
     * @return  R<List<MgtMapBigTotalVo>>
     */
    @PostMapping("/shopSalesRank")
    public R<List<MgtMapBigTotalVo>> shopSalesRank(@RequestBody List<Long> shopIdList){
        List<MgtMapBigTotalVo> mapIntTotalVoList= orderService.shopSalesRank(shopIdList);
        return R.ok(mapIntTotalVoList);
    }

    /**
     * @description  获取商户服务统计
     * @author  jqs
     * @date    2023/8/24 18:29
     * @param shopId
     * @return  R<MerHomeShopTotalVo>
     */
    @PostMapping("/getShopServiceTotal")
    public R<MerHomeShopTotalVo> getShopServiceTotal(@RequestBody Long shopId){
        MerHomeShopTotalVo homeShopTotalVo= orderService.getShopServiceTotal(shopId);
        return R.ok(homeShopTotalVo);
    }

    /**
     * @description  获取区域统计
     * @author  jqs
     * @date    2023/8/25 11:52
     * @param shopIdList
     * @return  R<AgencyTotalVo>
     */
    @PostMapping("/getAgencyTotalVo")
    public R<AgencyTotalVo> getAgencyTotalVo(@RequestBody List<Long> shopIdList){
        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);
    }
}