Merge branch 'score_shop' into api_score_meger

wzy

2021-09-04 1a9b054b95eb864d1ae7d90d1dfbb497ca1db62a

 zq-erp/src/main/java/com/matrix/system/score/dao/ScoreVipDetailDao.java

@@ -19,12 +19,16 @@
     * @param vipId
     * @return
     */
    int selectUserTotalScore(@Param("openId") String openId, @Param("vipId")Long vipId);
    int selectUserTotalScore(@Param("vipId")Long vipId);

    /**
     * 查询用户有效的积分，按时间顺序排
     * @param
     * @return
     */
    List<ScoreVipDetail> selectEffectiveScore(@Param("openId") String openId, @Param("vipId")Long vipId);
    List<ScoreVipDetail> selectEffectiveScore(@Param("vipId")Long vipId);

    List<ScoreVipDetail> selectInvalidaVipScore();

    int invalidVipScore();
}