Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-10 9c314ed0a45571e16b27dc8ff1a91230d77f0212

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/McsGameDAO.java

@@ -58,16 +58,18 @@
    /**
     * 查询商家下已被领取的卷总数
     * @param merchantId
     * @param type
     * @return
     */
    Integer selectAppliedCount(@Param("merchantId") Long merchantId);
    Integer selectAppliedCount(@Param("merchantId") Long merchantId, @Param("type") Integer type);

    /**
     * 查询商家下已被核销的卷总数
     * @param merchantId
     * @param type
     * @return
     */
    Integer selectVerifiedCount(@Param("merchantId") Long merchantId);
    Integer selectVerifiedCount(@Param("merchantId") Long merchantId, @Param("type") Integer type);

    /**
     * 获取热门游戏