From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserMerchantCouponServiceImpl.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 94d1a6b..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
@@ -26,6 +26,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -52,27 +53,24 @@
@Autowired
private IUserMerchantCouponService userMerchantCouponService;
-
+
@Autowired
private IMerchantCouponService merchantCouponService;
-
+
@Autowired
private IMerchantService merchantService;
-
+
@Autowired
private IUserInfoService userInfoService;
- @Autowired
- private RedisTemplate redisTemplate;
-
-
-
-
-
+ @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){
--
Gitblit v1.7.1