Merge branch 'feature/订单服务单代码改造' into alpha

Helius

2022-05-26 986e2fd11b5c0c22766ebe3f9b5f39a6fa4d8c9f

 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);
}