'合并'

src/main/java/com/futu/course/common/intercepter/AuthIntercepter.java

@@ -43,7 +43,7 @@ public class AuthIntercepter implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
             throws Exception {
         //System.out.println("preHandle");
-        String deviceId = request.getHeader("deviceId");
+
         String token = request.getHeader(ACCESSTOKEN);
 //        String time = request.getHeader("time");
         log.info(request.getRequestURI());
@@ -67,13 +67,7 @@ public class AuthIntercepter implements HandlerInterceptor {
 
             log.info("---interceptertoken");
             log.info(token);
-            if (StringUtils.isEmpty(deviceId)) {
 
-                //response.getWriter().print("");
-                log.info("*********************》deviceId错误");
-                throw new RRException("deviceId错误", 102);
-                //return false;
-            }
             if (StringUtils.isEmpty(token)) {
                 log.info("*********************》token为空");
                 throw new RRException("token错误,请重新登录", 101);
@@ -87,7 +81,7 @@ public class AuthIntercepter implements HandlerInterceptor {
             log.info("************************************》");
             Long userId = TokenUtils.getUserId(token);
             log.info("userId={}",userId);
-            Object obj = redisTemplate.opsForValue().get(Long.toString(userId));
+            Object obj = redisTemplate.opsForValue().get("user");
             if (obj == null) {
                 log.info("************************用户token不存在");
                 throw new RRException("token过期", 101);

src/main/java/com/futu/course/cupons/controller/CouponController.java

@@ -0,0 +1,27 @@
+package com.futu.course.cupons.controller;
+
+import com.futu.course.common.entity.R;
+import com.futu.course.cupons.domain.Coupon;
+import com.futu.course.cupons.service.CouponService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+@RestController
+@RequestMapping("/Coupon")
+public class CouponController {
+
+    @Resource
+    private CouponService couponService;
+
+    @RequestMapping("/findAll")
+    public R findAll(BigDecimal primary){
+        List<Coupon> all = couponService.findAll(primary);
+        return R.ok(all);
+    }
+
+
+}

src/main/java/com/futu/course/cupons/service/CouponService.java

@@ -3,6 +3,9 @@ package com.futu.course.cupons.service;
 import com.futu.course.cupons.domain.Coupon;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
 * @author yuu
 * @description 针对表【coupon(优惠券)】的数据库操作Service
@@ -10,4 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
 */
 public interface CouponService extends IService<Coupon> {
 
+//    获取能使用的优惠券
+    public List<Coupon> findAll(BigDecimal primary);
+
+
+
+
 }

src/main/java/com/futu/course/cupons/service/impl/CouponServiceImpl.java

@@ -4,8 +4,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.futu.course.cupons.domain.Coupon;
 import com.futu.course.cupons.service.CouponService;
 import com.futu.course.cupons.mapper.CouponMapper;
+import com.futu.course.user.domain.User;
+import com.futu.course.user.domain.UserCoupon;
+import com.futu.course.user.mapper.UserCouponMapper;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
 * @author yuu
 * @description 针对表【coupon(优惠券)】的数据库操作Service实现
@@ -15,6 +23,20 @@ import org.springframework.stereotype.Service;
 public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon>
     implements CouponService{
 
+    @Resource
+    private UserCouponMapper userCouponMapper;
+
+    @Resource
+    private RedisTemplate redisTemplate;
+
+    @Override
+    public List<Coupon> findAll(BigDecimal primary) {
+        User user = (User) redisTemplate.opsForValue().get("user");
+        System.err.println(user.getId());
+
+
+        return null;
+    }
 }
 
 

src/main/java/com/futu/course/user/service/impl/UserServiceImpl.java

@@ -212,7 +212,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User>
 //                        .signWith(key)
 //                        .compact();
 //                user.setToken(jws);
-//                redisTemplate.opsForValue().set("user",user,1, TimeUnit.DAYS);
+                redisTemplate.opsForValue().set("user",user,1, TimeUnit.DAYS);
                 return R.ok(jwtToken);
             }
 

获取用户id

@@ -1 +1 @@
-使用          ThreadLocalUtil.get();          获取用户id
+使用             User user = (User) redisTemplate.opsForValue().get("user");     获取用户id