|
@@ -1,7 +1,6 @@
|
|
package com.caimei365.user.service.impl;
|
|
package com.caimei365.user.service.impl;
|
|
|
|
|
|
import com.caimei365.user.components.CommonService;
|
|
import com.caimei365.user.components.CommonService;
|
|
-import com.caimei365.user.feign.VipProductFeign;
|
|
|
|
import com.caimei365.user.mapper.BaseMapper;
|
|
import com.caimei365.user.mapper.BaseMapper;
|
|
import com.caimei365.user.mapper.LoginMapper;
|
|
import com.caimei365.user.mapper.LoginMapper;
|
|
import com.caimei365.user.mapper.SuperVipMapper;
|
|
import com.caimei365.user.mapper.SuperVipMapper;
|
|
@@ -10,7 +9,6 @@ import com.caimei365.user.components.RedisService;
|
|
import com.caimei365.user.model.dto.MobileDto;
|
|
import com.caimei365.user.model.dto.MobileDto;
|
|
import com.caimei365.user.model.dto.PasswordDto;
|
|
import com.caimei365.user.model.dto.PasswordDto;
|
|
import com.caimei365.user.model.dto.SuperVipDto;
|
|
import com.caimei365.user.model.dto.SuperVipDto;
|
|
-import com.caimei365.user.model.po.ShopPo;
|
|
|
|
import com.caimei365.user.model.po.SuperVipPo;
|
|
import com.caimei365.user.model.po.SuperVipPo;
|
|
import com.caimei365.user.model.po.VipPayHistoryPo;
|
|
import com.caimei365.user.model.po.VipPayHistoryPo;
|
|
import com.caimei365.user.model.vo.*;
|
|
import com.caimei365.user.model.vo.*;
|
|
@@ -48,8 +46,7 @@ public class BaseServiceImpl implements BaseService {
|
|
private LoginMapper loginMapper;
|
|
private LoginMapper loginMapper;
|
|
@Value("${spring.cloud.config.profile}")
|
|
@Value("${spring.cloud.config.profile}")
|
|
private String profile;
|
|
private String profile;
|
|
- @Resource
|
|
|
|
- private VipProductFeign vipFeign;
|
|
|
|
|
|
+
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取图片验证码
|
|
* 获取图片验证码
|
|
@@ -483,10 +480,8 @@ public class BaseServiceImpl implements BaseService {
|
|
List<Integer> couponGet = vipMapper.findCouponGet(userId, useTime + 1);
|
|
List<Integer> couponGet = vipMapper.findCouponGet(userId, useTime + 1);
|
|
vipCoupon.forEach(couponVo -> couponVo.setGetFlag(couponGet.contains(couponVo.getCouponId()) ? 1 : 0));
|
|
vipCoupon.forEach(couponVo -> couponVo.setGetFlag(couponGet.contains(couponVo.getCouponId()) ? 1 : 0));
|
|
map.put("coupon", vipCoupon);
|
|
map.put("coupon", vipCoupon);
|
|
- //3.查优惠商品
|
|
|
|
- ResponseJson<Map<String, Object>> svipProductPage = vipFeign.getSvipProductPage(userId, source, 1, 10);
|
|
|
|
- PaginationVo<ProductItemVo> page = (PaginationVo<ProductItemVo>) svipProductPage.getData().get("svipProductPage");
|
|
|
|
- map.put("product",page);
|
|
|
|
|
|
+ //todo 3.查优惠商品
|
|
|
|
+
|
|
return ResponseJson.success(map);
|
|
return ResponseJson.success(map);
|
|
}
|
|
}
|
|
|
|
|