Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into ma...

jiangqs

2023-08-26 da837b5a0e23b47bc1d038547702cab3cecce577

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/order/OrderService.java

@@ -480,7 +480,6 @@
     */
    StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto);


    /**
     * @description  检查订单状态定时任务
     * @author  jqs
@@ -551,4 +550,18 @@
     * @return  AgencyTotalVo
     */
    AgencyTotalVo getAgencyTotalVo(List<Long> shopIdList);

    /**
     * 订单编号获取订单
     * @param orderNo
     * @return
     */
    Order getByOrderNo(String orderNo);

    /**
     *
     * @param outTradeNo
     * @return
     */
    Order getByOutTradeNo(String outTradeNo);
}