Merge branch 'developer' into alpha

Helius

2022-03-10 6678c4c0f42d25e0a63416f4ac5dda3cd66627a7

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponRecordDao.java

@@ -39,13 +39,14 @@
   
   public ShopCouponRecord  selectForUpdate(Integer id);

   List<CouponReceiveInfoVO> selectMyCouponByUserId(@Param("userId") String userId);
   List<CouponReceiveInfoVO> selectMyCouponByUserId(@Param("userId") Long userId);

   CouponReceiveInfoVO selectMyCouponByReceiveId(@Param("receiveId") Integer receiveId);

   List<CouponReceiveInfoVO> selectMyCouponByStatus(@Param("companyId") Long shopId, @Param("userId") String userId, @Param("status") Integer status,
   List<CouponReceiveInfoVO> selectMyCouponByStatus(@Param("companyId") Long shopId, @Param("userId") Long userId, @Param("status") Integer status,
                                                     @Param("pageVo") PaginationVO pageVo);

   List<CouponReceiveInfoVO> selectMyPastCoupon(@Param("companyId")Long shopId, @Param("userId") String userId, @Param("pageVo") PaginationVO pageVo);
   List<CouponReceiveInfoVO> selectMyPastCoupon(@Param("companyId")Long shopId, @Param("userId") Long userId, @Param("pageVo") PaginationVO pageVo);

   int countUnuseCouponRecord(Long id);
}