From 1d1576eaa5fc80fd8ce0c360a3dca60b5003a54d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 09:39:58 +0800
Subject: [PATCH] bug修改

---
 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
index cab4212..cd225e5 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -15,6 +15,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.uid;
+
 
 @Service
 public class UserCouponRecordServiceImpl extends ServiceImpl<UserCouponRecordMapper, UserCouponRecord> implements IUserCouponRecordService {
@@ -36,6 +38,25 @@
     public int queryAvailable(Integer uid, Integer companyId, Integer state, Integer couponUseType, Double money) throws Exception {
         return userCouponRecordMapper.queryAvailable(uid, companyId, state, couponUseType, money);
     }
+    /**
+     * 获取可用优惠券数量
+     * @param uid
+     * @param companyId
+     * @param state
+     * @param couponUseType
+     * @return
+     * @throws Exception
+     */
+    @Override
+    public List<Map<String, Object>> queryAvailable_(Integer uid, Integer companyId, Integer state, Integer couponUseType, Double money){
+        return userCouponRecordMapper.queryAvailable_(uid, companyId, state, couponUseType, money);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryCouponCrossCity(List<Integer> ids, Integer pageNum, Integer size) {
+        pageNum = (pageNum - 1) * size;
+        return userCouponRecordMapper.queryCouponCrossCity(ids, pageNum, size);
+    }
 
 
     /**
@@ -51,7 +72,9 @@
     
     @Override
     public List<Map<String, Object>> queryCoupon1(Integer uid, String cityCode, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception {
-        pageNum = (pageNum - 1) * size;
+        if(null != pageNum && null != size){
+            pageNum = (pageNum - 1) * size;
+        }
         List<Map<String, Object>> list = userCouponRecordMapper.queryCoupon1(uid, cityCode, state, couponUseType, money, pageNum, size);
         for (Map<String, Object> map : list) {
             Object citys = map.get("citys");

--
Gitblit v1.7.1