Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-23 3fd5b6267e4468f179d1f339fee961b89cea7afa

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

@@ -590,4 +590,14 @@
     * @return  List<MgtMapIntTotalVo>
     */
    List<MgtMapIntTotalVo> getStaffActivityMemberTotal(@Param("param")StaffTotalDto staffTotalDto);

    /**
     * @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);
}