|
@@ -2,6 +2,7 @@ package com.caimei365.user.service.impl;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.caimei365.user.components.RedisService;
|
|
|
import com.caimei365.user.feign.CommodityFeign;
|
|
|
import com.caimei365.user.mapper.*;
|
|
|
import com.caimei365.user.model.ResponseJson;
|
|
@@ -12,10 +13,7 @@ import com.caimei365.user.model.dto.ShopUpdateDto;
|
|
|
import com.caimei365.user.model.po.*;
|
|
|
import com.caimei365.user.model.vo.*;
|
|
|
import com.caimei365.user.service.ShopService;
|
|
|
-import com.caimei365.user.utils.DateUtil;
|
|
|
-import com.caimei365.user.utils.GenerateUtils;
|
|
|
-import com.caimei365.user.utils.ImageUtils;
|
|
|
-import com.caimei365.user.utils.OssUtil;
|
|
|
+import com.caimei365.user.utils.*;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -42,6 +40,8 @@ public class ShopServiceImpl implements ShopService {
|
|
|
@Value("${caimei.wwwDomain}")
|
|
|
private String wwwDomain;
|
|
|
@Resource
|
|
|
+ private RedisService redisService;
|
|
|
+ @Resource
|
|
|
private CommodityFeign commodityFeign;
|
|
|
@Resource
|
|
|
private BaseMapper baseMapper;
|
|
@@ -68,6 +68,11 @@ public class ShopServiceImpl implements ShopService {
|
|
|
@Override
|
|
|
public ResponseJson<UserLoginVo> shortcutLogin(Integer userId) {
|
|
|
UserLoginVo userLoginVo = shopMapper.getShopByUserId(userId);
|
|
|
+ // 生成token给用户
|
|
|
+ String token = JwtUtil.createToken(userId);
|
|
|
+ // 为了过期续签,将token存入redis,并设置超时时间
|
|
|
+ redisService.set(token, token, JwtUtil.getExpireTime());
|
|
|
+ userLoginVo.setToken(token);
|
|
|
if (null != userLoginVo) {
|
|
|
if (null != userLoginVo.getShopId()) {
|
|
|
if (null != userLoginVo.getShopStatus() && null != userLoginVo.getUserIdentity() && 3 == userLoginVo.getUserIdentity()) {
|
|
@@ -89,6 +94,7 @@ public class ShopServiceImpl implements ShopService {
|
|
|
if (null != shopProductList) {
|
|
|
for(String product : shopProductList ) {
|
|
|
if (StringUtils.isNotBlank(product)) {
|
|
|
+ // 商品上架平台是否在联合丽格上架
|
|
|
if (product.contains("4")) {
|
|
|
flag = true;
|
|
|
}
|