Commit 0efe06bf by wilse

fix something

parent 60b10b98
...@@ -65,6 +65,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; ...@@ -65,6 +65,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -784,7 +785,7 @@ public class Schedule { ...@@ -784,7 +785,7 @@ public class Schedule {
//先删除热销标签 //先删除热销标签
//款式的所有标签 //款式的所有标签
List<BaseFeatures> baseFeaturesList = baseFeaturesMapper.queryProduceFeaturesById(baseProduce.getId()); List<BaseFeatures> baseFeaturesList = baseFeaturesMapper.queryProduceFeaturesById(baseProduce.getId());
if(null != baseFeaturesList) {
BaseFeatures specItem = ListUtil.getOne(baseFeaturesList, BaseFeatures::getName, "限时特价"); BaseFeatures specItem = ListUtil.getOne(baseFeaturesList, BaseFeatures::getName, "限时特价");
if (specItem != null) { if (specItem != null) {
...@@ -792,7 +793,7 @@ public class Schedule { ...@@ -792,7 +793,7 @@ public class Schedule {
.eq(FeaturesMapping::getDataId, baseProduce.getId()) .eq(FeaturesMapping::getDataId, baseProduce.getId())
.eq(FeaturesMapping::getFeaturesId, specItem.getId())); .eq(FeaturesMapping::getFeaturesId, specItem.getId()));
} }
}
//如果不是限时特价 //如果不是限时特价
if (producePromotionTime == null) { if (producePromotionTime == null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment