From 81f6d10bb745825437e0145c6d27bc3468ee281c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 31 七月 2025 17:59:56 +0800
Subject: [PATCH] 修改后台需要功能
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java
index 9ce6cff..0b879e2 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
@@ -16,7 +15,6 @@
import com.stylefeng.guns.modular.system.dao.UserMerchantCouponMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.UUIDUtil;
import com.stylefeng.guns.modular.system.warpper.MerchantCouponListWarpper;
@@ -25,8 +23,10 @@
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -53,27 +53,24 @@
@Autowired
private IUserMerchantCouponService userMerchantCouponService;
-
+
@Autowired
private IMerchantCouponService merchantCouponService;
-
+
@Autowired
private IMerchantService merchantService;
-
+
@Autowired
private IUserInfoService userInfoService;
-
- @Autowired
- private RedisUtil redisUtil;
-
-
-
-
-
+
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
+
@Override
public ResultUtil<UserMerchantCouponWapper> getUserMerchantCoupon(Integer uid, String code) throws Exception {
Merchant merchant = merchantService.selectOne(new EntityWrapper<Merchant>().eq("userType", 1).eq("userId", uid).ne("state", 3));
- if(merchant.getAuditStatus() == 1){
+ if (merchant.getAuditStatus() == 1) {
return ResultUtil.error("账户正在审核中");
}
if(merchant.getAuditStatus() == 3){
@@ -238,7 +235,7 @@
@Override
public synchronized List<MerchantCouponListWarpper> getMerchantCoupon(Integer uid) throws Exception {
UserInfo userInfo = userInfoService.selectById(uid);
- String value = redisUtil.getValue("merchantVoucher");
+ String value = (String) redisTemplate.opsForValue().get("merchantVoucher");
List<MerchantCouponListWarpper> listWarppers = new ArrayList<>();
if(ToolUtil.isNotEmpty(value)){
JSONObject jsonObject = JSON.parseObject(value);
@@ -247,7 +244,7 @@
listWarppers = jsonArray.toJavaList(MerchantCouponListWarpper.class);
}
jsonObject.put(userInfo.getPhone(), new JSONArray());
- redisUtil.setStrValue("merchantVoucher", jsonObject.toJSONString());
+ redisTemplate.opsForValue().set("merchantVoucher", jsonObject.toJSONString());
}
return listWarppers;
--
Gitblit v1.7.1