diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 3c05d239..142e8798 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -40,6 +40,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.joda.time.LocalTime; import org.springframework.beans.BeanUtils; import org.springframework.data.domain.*; import org.springframework.stereotype.Service; @@ -473,6 +474,9 @@ public class TbProductServiceImpl implements TbProductService { } //保存到sku_result if ("sku".equals(resources.getTypeEnum())) { + if (StringUtils.isNotBlank(resources.getSkuSnap())) { + resources.setSkuSnap(resources.getSkuSnap().replace("label", "name")); + } TbProductSkuResult productSkuResult = new TbProductSkuResult(); productSkuResult.setCreatedAt(Instant.now().toEpochMilli()); productSkuResult.setUpdatedAt(Instant.now().toEpochMilli()); @@ -527,7 +531,7 @@ public class TbProductServiceImpl implements TbProductService { if (!"coupon".equals(product.getType())) { if (resources.getCategoryId() == null) throw new BadRequestException("商品分类不可为空"); 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()); } } @@ -580,6 +584,9 @@ public class TbProductServiceImpl implements TbProductService { } //保存到sku_result if ("sku".equals(resources.getTypeEnum())) { + if (StringUtils.isNotBlank(resources.getSkuSnap())) { + resources.setSkuSnap(resources.getSkuSnap().replace("label", "name")); + } TbProductSkuResult productSkuResult = new TbProductSkuResult(); productSkuResult.setCreatedAt(Instant.now().toEpochMilli()); productSkuResult.setUpdatedAt(Instant.now().toEpochMilli()); @@ -766,12 +773,11 @@ public class TbProductServiceImpl implements TbProductService { queryWrapper.eq("is_del", 0) .eq(false,"type", "coupon") .eq("shop_id", shopId) - .eq("is_delete", 0) .eq("status", 1) .eq("is_del", 0) - .like("days", DateUtil.dayOfWeekEnum(new Date()).getValue()) - .gt("end_time", System.currentTimeMillis()) - .lt("start_time", System.currentTimeMillis()) + .like("days", "%"+DateUtil.dayOfWeekEnum(new Date()).name()+"%") + .gt("end_time", new LocalTime()) + .lt("start_time", new LocalTime()) .eq("is_pause_sale", 0); // 查询skuResult @@ -871,7 +877,4 @@ public class TbProductServiceImpl implements TbProductService { } } - public static void main(String[] args) { - - } }