bug

jiangqs

2023-08-22 95044dd4dacee5f7ecb081af5d557d14fad83c24

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/mapper/order/OrderMapper.java

@@ -61,7 +61,7 @@
     * @param userId
     * @return
     */
    List<MerMemberOrderVo> pageMerMemberOrder(Page page,  @Param("userId") Long userId);
    List<MerMemberOrderVo> pageMerMemberOrder(Page page,  @Param("userId") Long userId,@Param("shopId") Long shopId);

    /**
     * 获取用户订单统计
@@ -444,6 +444,17 @@

    /**
     * @description
     * @author  jqs
     * @date    2023/6/25 17:28
     * @param shopId
     * @return  MerHomeShopTotalVo
     */
    MerHomeShopTotalVo getMerHomeShopServiceTotalVo(Long shopId);



    /**
     * @description
     * @author  cheny
     * @param shopIds
     * @return  MerHomeShopTotalVo