From b1b172a6f1c67b6a02647b9db081f23bf15e4906 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 26 六月 2025 20:04:27 +0800
Subject: [PATCH] bug修改
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 70 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 4 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 d89b29e..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
@@ -1,5 +1,8 @@
package com.stylefeng.guns.modular.system.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.UserCouponRecordMapper;
import com.stylefeng.guns.modular.system.model.UserCouponRecord;
@@ -8,8 +11,11 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.uid;
@Service
@@ -32,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);
+ }
/**
@@ -44,8 +69,30 @@
pageNum = (pageNum - 1) * size;
return userCouponRecordMapper.queryCoupon(uid, companyId, state, couponUseType, money, pageNum, size);
}
-
-
+
+ @Override
+ public List<Map<String, Object>> queryCoupon1(Integer uid, String cityCode, Integer state, Integer couponUseType, Double money, Integer pageNum, Integer size) throws Exception {
+ 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");
+ if(null != citys){
+ List<String> names = new ArrayList<>();
+ String s = citys.toString();
+ JSONArray jsonArray = JSON.parseArray(s);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ String name = jsonObject.getString("name");
+ names.add(name);
+ }
+ map.put("citys", JSON.toJSONString(names));
+ }
+ }
+ return list;
+ }
+
/**
* 获取优惠券列表
* @param state
@@ -58,7 +105,22 @@
@Override
public List<Map<String, Object>> queryMyCoupons(Integer state, Integer pageNum, Integer size, Integer uid) throws Exception {
pageNum = (pageNum - 1) * size;
- return userCouponRecordMapper.queryMyCoupons(state, pageNum, size, uid);
+ List<Map<String, Object>> list = userCouponRecordMapper.queryMyCoupons(state, pageNum, size, uid);
+ for (Map<String, Object> map : list) {
+ Object citys = map.get("citys");
+ if(null != citys){
+ List<String> names = new ArrayList<>();
+ String s = citys.toString();
+ JSONArray jsonArray = JSON.parseArray(s);
+ for (int i = 0; i < jsonArray.size(); i++) {
+ JSONObject jsonObject = jsonArray.getJSONObject(i);
+ String name = jsonObject.getString("name");
+ names.add(name);
+ }
+ map.put("citys", JSON.toJSONString(names));
+ }
+ }
+ return list;
}
/**
@@ -70,7 +132,7 @@
@Override
public ResultUtil delMyCoupon(Integer id, Integer uid) throws Exception {
UserCouponRecord userCouponRecord = userCouponRecordMapper.selectById(id);
- if(userCouponRecord.getUserId() != uid){
+ if(!userCouponRecord.getUserId().equals(uid)){
return ResultUtil.error("您不能删除此优惠券");
}
userCouponRecordMapper.deleteById(id);
--
Gitblit v1.7.1