|
@@ -7,6 +7,8 @@ import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
+import shop.alien.dining.config.BaseRedisService;
|
|
|
|
|
+import shop.alien.dining.service.CartService;
|
|
|
import shop.alien.entity.store.StoreCart;
|
|
import shop.alien.entity.store.StoreCart;
|
|
|
import shop.alien.entity.store.StoreCouponUsage;
|
|
import shop.alien.entity.store.StoreCouponUsage;
|
|
|
import shop.alien.entity.store.StoreCuisine;
|
|
import shop.alien.entity.store.StoreCuisine;
|
|
@@ -18,8 +20,6 @@ import shop.alien.mapper.StoreCartMapper;
|
|
|
import shop.alien.mapper.StoreCouponUsageMapper;
|
|
import shop.alien.mapper.StoreCouponUsageMapper;
|
|
|
import shop.alien.mapper.StoreCuisineMapper;
|
|
import shop.alien.mapper.StoreCuisineMapper;
|
|
|
import shop.alien.mapper.StoreTableMapper;
|
|
import shop.alien.mapper.StoreTableMapper;
|
|
|
-import shop.alien.dining.config.BaseRedisService;
|
|
|
|
|
-import shop.alien.dining.service.CartService;
|
|
|
|
|
import shop.alien.util.common.JwtUtil;
|
|
import shop.alien.util.common.JwtUtil;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
@@ -174,6 +174,9 @@ public class CartServiceImpl implements CartService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 获取当前用户信息
|
|
// 获取当前用户信息
|
|
|
|
|
+// JSONObject userInfo = new JSONObject();
|
|
|
|
|
+// userInfo.put("userId",1);
|
|
|
|
|
+// userInfo.put("phone","19999990001");
|
|
|
com.alibaba.fastjson.JSONObject userInfo = JwtUtil.getCurrentUserInfo();
|
|
com.alibaba.fastjson.JSONObject userInfo = JwtUtil.getCurrentUserInfo();
|
|
|
Integer userId = userInfo != null ? userInfo.getInteger("userId") : null;
|
|
Integer userId = userInfo != null ? userInfo.getInteger("userId") : null;
|
|
|
String userPhone = userInfo != null ? userInfo.getString("phone") : null;
|
|
String userPhone = userInfo != null ? userInfo.getString("phone") : null;
|