bug修改

mitao

2025-01-17 afa0dbb4f54e7244835dd67ec33c3e545f122f71

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

@@ -37,10 +37,10 @@
    /**
     * 收银未结清订单列表
     * @param page
     * @param userId
     * @param pageMerMemberNoClearOrder
     * @return
     */
    List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("userId") Long userId);
    List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, @Param("param") MerMemberNoClearOrderDto pageMerMemberNoClearOrder);



@@ -141,7 +141,7 @@
     * @author jqs34
     * @date 2023/6/18 17:20
     */
    MgtBulletinBoardVo boardOrderTotal();
    MgtBulletinBoardVo boardOrderTotal(@Param("shopIds") List<Long> shopIds);

    /**
     * @description  活动人数统计
@@ -150,7 +150,7 @@
     * @param
     * @return  Integer
     */
    Integer activityUserTotal();
    Integer activityUserTotal(@Param("shopIds") List<Long> shopIds);

    /**
    * @description getTotalOrderTotalOrderFrom
@@ -437,7 +437,7 @@
     * @author jqs34
     * @date 2023/6/19 22:48
     */
    List<MgtMapBigTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);
    List<MgtMapIntTotalVo> listPlTotalShopActivityRank(@Param("param") MgtBasePlatformDto mgtBasePlatformDto);

    /**
     * @description listTotalActivityTotal
@@ -655,15 +655,17 @@

    List<MgtMapIntTotalVo> getMgtActivityMemberTotal(@Param("param")MgtBasePlatformDto mgtBasePlatformDto);


    List<MgtMapIntTotalVo> getActivityMemberTotal(@Param("param")MgtBaseShopDto mgtBaseShopDto);

    /**
     * @description  获取用户商品购买数量
     * @author  jqs
     * @date    2023/7/23 18:17
     * @param userId
     * @param goodsId
     * @return  Integer
     */
    Integer countUserBuyGoodsNum(@Param("userId")Long userId, @Param("goodsId")String goodsId);
    Integer countUserBuyGoodsNum(@Param("goodsId")String goodsId);


    /**
@@ -700,4 +702,14 @@
     * @return  AgencyTotalVo
     */
    AgencyTotalVo getAgencyTotalVo(@Param("shopIdList")List<Long> shopIdList);


    /**
     * @description  商户端会员订单统计
     * @author  jqs
     * @date    2023/8/29 17:39
     * @param merBaseDto
     * @return  MerMemberSimpleTotalVo
     */
    MerMemberSimpleTotalVo getMerMemberSimpleTotalVo(@Param("param") MerBaseDto merBaseDto);
}