From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
index 84636e8..b908d94 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserCouponRecordService.java
@@ -27,7 +27,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryCoupon(Integer uid, Integer companyId, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception;
+ List<Map<String, Object>> queryCoupon(Integer language, Integer uid, Integer companyId, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception;
/**
@@ -38,7 +38,7 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> queryMyCoupons(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception;
+ List<Map<String, Object>> queryMyCoupons(Integer language, Integer state, Integer pageNum, Integer size, Integer uid) throws Exception;
/**
@@ -47,7 +47,7 @@
* @param uid
* @throws Exception
*/
- ResultUtil delMyCoupon(Integer id, Integer uid) throws Exception;
+ ResultUtil delMyCoupon(Integer id, Integer uid, Integer language) throws Exception;
/**
@@ -58,7 +58,7 @@
* @return
* @throws Exception
*/
- ResultUtil handselCoupon(Integer id, Integer uid, Integer userId) throws Exception;
+ ResultUtil handselCoupon(Integer id, Integer uid, Integer userId, Integer language) throws Exception;
/**
--
Gitblit v1.7.1