|
@@ -11,15 +11,12 @@ import io.swagger.annotations.*;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.poi.util.StringUtil;
|
|
import org.apache.poi.util.StringUtil;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
import org.springframework.util.CollectionUtils;
|
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import shop.alien.entity.result.R;
|
|
import shop.alien.entity.result.R;
|
|
|
import shop.alien.entity.second.SecondGoods;
|
|
import shop.alien.entity.second.SecondGoods;
|
|
|
-import shop.alien.entity.second.vo.SecondCommentVo;
|
|
|
|
|
import shop.alien.entity.second.vo.SecondGoodsRecommendVo;
|
|
import shop.alien.entity.second.vo.SecondGoodsRecommendVo;
|
|
|
-import shop.alien.entity.second.vo.SecondGoodsVo;
|
|
|
|
|
import shop.alien.entity.store.*;
|
|
import shop.alien.entity.store.*;
|
|
|
import shop.alien.entity.store.vo.StoreInfoVo;
|
|
import shop.alien.entity.store.vo.StoreInfoVo;
|
|
|
import shop.alien.mapper.*;
|
|
import shop.alien.mapper.*;
|
|
@@ -27,8 +24,6 @@ import shop.alien.mapper.second.SecondGoodsMapper;
|
|
|
import shop.alien.mapper.second.SecondRecommendMapper;
|
|
import shop.alien.mapper.second.SecondRecommendMapper;
|
|
|
import shop.alien.store.annotation.TrackEvent;
|
|
import shop.alien.store.annotation.TrackEvent;
|
|
|
import shop.alien.store.config.GaoDeMapUtil;
|
|
import shop.alien.store.config.GaoDeMapUtil;
|
|
|
-import shop.alien.store.service.LifeDiscountCouponService;
|
|
|
|
|
-import shop.alien.util.common.Constants;
|
|
|
|
|
import shop.alien.util.common.JwtUtil;
|
|
import shop.alien.util.common.JwtUtil;
|
|
|
import shop.alien.util.common.ListToPage;
|
|
import shop.alien.util.common.ListToPage;
|
|
|
import shop.alien.util.type.PhoneTypeIdResult;
|
|
import shop.alien.util.type.PhoneTypeIdResult;
|
|
@@ -36,7 +31,10 @@ import shop.alien.util.type.TypeUtil;
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.text.DecimalFormat;
|
|
import java.text.DecimalFormat;
|
|
|
-import java.util.*;
|
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
+import java.util.List;
|
|
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -269,7 +267,7 @@ public class LifeCollectController {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
String userId = lifeCollect.getUserId().trim();
|
|
String userId = lifeCollect.getUserId().trim();
|
|
|
- if (!userId.contains("_")) {
|
|
|
|
|
|
|
+ if ( typeUtil.containsUnderscore(userId) ) {
|
|
|
try {
|
|
try {
|
|
|
LifeUser lifeUser = lifeUserMapper.selectById(Integer.parseInt(userId));
|
|
LifeUser lifeUser = lifeUserMapper.selectById(Integer.parseInt(userId));
|
|
|
if (lifeUser == null || org.springframework.util.StringUtils.isEmpty(lifeUser.getUserPhone())) {
|
|
if (lifeUser == null || org.springframework.util.StringUtils.isEmpty(lifeUser.getUserPhone())) {
|