代客下单 查询校验
This commit is contained in:
@@ -40,6 +40,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.joda.time.LocalTime;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
import org.springframework.data.domain.*;
|
import org.springframework.data.domain.*;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -473,6 +474,9 @@ public class TbProductServiceImpl implements TbProductService {
|
|||||||
}
|
}
|
||||||
//保存到sku_result
|
//保存到sku_result
|
||||||
if ("sku".equals(resources.getTypeEnum())) {
|
if ("sku".equals(resources.getTypeEnum())) {
|
||||||
|
if (StringUtils.isNotBlank(resources.getSkuSnap())) {
|
||||||
|
resources.setSkuSnap(resources.getSkuSnap().replace("label", "name"));
|
||||||
|
}
|
||||||
TbProductSkuResult productSkuResult = new TbProductSkuResult();
|
TbProductSkuResult productSkuResult = new TbProductSkuResult();
|
||||||
productSkuResult.setCreatedAt(Instant.now().toEpochMilli());
|
productSkuResult.setCreatedAt(Instant.now().toEpochMilli());
|
||||||
productSkuResult.setUpdatedAt(Instant.now().toEpochMilli());
|
productSkuResult.setUpdatedAt(Instant.now().toEpochMilli());
|
||||||
@@ -527,7 +531,7 @@ public class TbProductServiceImpl implements TbProductService {
|
|||||||
if (!"coupon".equals(product.getType())) {
|
if (!"coupon".equals(product.getType())) {
|
||||||
if (resources.getCategoryId() == null) throw new BadRequestException("商品分类不可为空");
|
if (resources.getCategoryId() == null) throw new BadRequestException("商品分类不可为空");
|
||||||
product.setGroupSnap(null);
|
product.setGroupSnap(null);
|
||||||
if (resources.getNotices() != null && resources.getNotices().getId() != null) {
|
if (resources.getNotices() != null && resources.getNotices().getId() != null && resources.getNotices().getId() > 0) {
|
||||||
noticeRepository.deleteById(resources.getNotices().getId());
|
noticeRepository.deleteById(resources.getNotices().getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -580,6 +584,9 @@ public class TbProductServiceImpl implements TbProductService {
|
|||||||
}
|
}
|
||||||
//保存到sku_result
|
//保存到sku_result
|
||||||
if ("sku".equals(resources.getTypeEnum())) {
|
if ("sku".equals(resources.getTypeEnum())) {
|
||||||
|
if (StringUtils.isNotBlank(resources.getSkuSnap())) {
|
||||||
|
resources.setSkuSnap(resources.getSkuSnap().replace("label", "name"));
|
||||||
|
}
|
||||||
TbProductSkuResult productSkuResult = new TbProductSkuResult();
|
TbProductSkuResult productSkuResult = new TbProductSkuResult();
|
||||||
productSkuResult.setCreatedAt(Instant.now().toEpochMilli());
|
productSkuResult.setCreatedAt(Instant.now().toEpochMilli());
|
||||||
productSkuResult.setUpdatedAt(Instant.now().toEpochMilli());
|
productSkuResult.setUpdatedAt(Instant.now().toEpochMilli());
|
||||||
@@ -766,12 +773,11 @@ public class TbProductServiceImpl implements TbProductService {
|
|||||||
queryWrapper.eq("is_del", 0)
|
queryWrapper.eq("is_del", 0)
|
||||||
.eq(false,"type", "coupon")
|
.eq(false,"type", "coupon")
|
||||||
.eq("shop_id", shopId)
|
.eq("shop_id", shopId)
|
||||||
.eq("is_delete", 0)
|
|
||||||
.eq("status", 1)
|
.eq("status", 1)
|
||||||
.eq("is_del", 0)
|
.eq("is_del", 0)
|
||||||
.like("days", DateUtil.dayOfWeekEnum(new Date()).getValue())
|
.like("days", "%"+DateUtil.dayOfWeekEnum(new Date()).name()+"%")
|
||||||
.gt("end_time", System.currentTimeMillis())
|
.gt("end_time", new LocalTime())
|
||||||
.lt("start_time", System.currentTimeMillis())
|
.lt("start_time", new LocalTime())
|
||||||
.eq("is_pause_sale", 0);
|
.eq("is_pause_sale", 0);
|
||||||
|
|
||||||
// 查询skuResult
|
// 查询skuResult
|
||||||
@@ -871,7 +877,4 @@ public class TbProductServiceImpl implements TbProductService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user