master
parent
d422211f70
commit
7364acd5bb
|
@ -1,5 +1,6 @@
|
||||||
package com.bwie.goods.controller;
|
package com.bwie.goods.controller;
|
||||||
|
|
||||||
|
import com.bwie.common.config.RedissonConfig;
|
||||||
import com.bwie.common.constants.TokenConstants;
|
import com.bwie.common.constants.TokenConstants;
|
||||||
import com.bwie.common.domain.Cart;
|
import com.bwie.common.domain.Cart;
|
||||||
import com.bwie.common.domain.Middle;
|
import com.bwie.common.domain.Middle;
|
||||||
|
@ -13,12 +14,15 @@ import com.bwie.common.utils.JwtUtils;
|
||||||
import com.bwie.goods.feign.UserFeign;
|
import com.bwie.goods.feign.UserFeign;
|
||||||
import com.bwie.goods.service.CartService;
|
import com.bwie.goods.service.CartService;
|
||||||
import com.bwie.goods.service.MiddleService;
|
import com.bwie.goods.service.MiddleService;
|
||||||
|
import org.redisson.api.RLock;
|
||||||
|
import org.redisson.api.RedissonClient;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("cart")
|
@RequestMapping("cart")
|
||||||
|
@ -30,9 +34,12 @@ public class CartController {
|
||||||
private MiddleService middleService;
|
private MiddleService middleService;
|
||||||
@Autowired
|
@Autowired
|
||||||
private UserFeign userFeign;
|
private UserFeign userFeign;
|
||||||
|
@Autowired
|
||||||
|
private RedissonClient RedissonClient;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private HttpServletRequest request;
|
private HttpServletRequest request;
|
||||||
|
|
||||||
@PostMapping("addCart")
|
@PostMapping("addCart")
|
||||||
public Result addCart(@RequestBody CartAddReq req) {
|
public Result addCart(@RequestBody CartAddReq req) {
|
||||||
Middle middle = middleService.selectById(req.getId());
|
Middle middle = middleService.selectById(req.getId());
|
||||||
|
@ -49,6 +56,7 @@ public class CartController {
|
||||||
List<CartResp> list = cartService.findList();
|
List<CartResp> list = cartService.findList();
|
||||||
return Result.success(list);
|
return Result.success(list);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("pay")
|
@PostMapping("pay")
|
||||||
public Result pay(@RequestBody CartPayReq req) {
|
public Result pay(@RequestBody CartPayReq req) {
|
||||||
String token = request.getHeader(TokenConstants.TOKEN);
|
String token = request.getHeader(TokenConstants.TOKEN);
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
from t_seckill
|
from t_seckill
|
||||||
<where>
|
<where>
|
||||||
<if test="seckillName!=null and seckillName!=''">
|
<if test="seckillName!=null and seckillName!=''">
|
||||||
and instr(seckillName,#{seckillName})
|
and instr(seckill_Name,#{seckillName})
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</select>
|
||||||
|
|
Loading…
Reference in New Issue