diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index d1d3445..01a1411 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.gxwebsoft.shop.service.impl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -10,9 +9,7 @@ import com.gxwebsoft.common.core.utils.*; import com.gxwebsoft.common.core.service.PaymentCacheService; import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService; import com.gxwebsoft.common.core.config.SpringContextUtil; -import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.system.entity.Payment; -import com.gxwebsoft.common.system.entity.User; import com.gxwebsoft.shop.entity.*; import com.gxwebsoft.shop.service.*; import com.wechat.pay.java.core.RSAAutoCertificateConfig; @@ -39,13 +36,10 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; -import java.sql.Date; import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import static com.gxwebsoft.common.core.utils.DateTimeUtil.formatDateTime; - /** * 订单Service实现 * @@ -311,7 +305,7 @@ public class ShopOrderServiceImpl extends ServiceImpl