From 8ee2a3ef15905aa00966ddb72d7685cdfb6e93ad Mon Sep 17 00:00:00 2001 From: clunt Date: Sun, 25 Sep 2022 20:48:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E4=BB=B7=E5=8D=95=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/order/OrderDetailController.java | 1 - .../com/ghy/web/controller/order/OrderMasterController.java | 2 -- .../main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java | 1 - .../src/main/java/com/ghy/order/mapper/OrderDetailMapper.java | 1 - .../src/main/java/com/ghy/order/service/OrderGoodsService.java | 1 - .../java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java | 1 - .../resources/mapper/financial/FinancialChangeRecordMapper.xml | 2 +- .../main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java | 1 - 8 files changed, 1 insertion(+), 9 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 7c0e3a31..fbab126e 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -11,7 +11,6 @@ import com.ghy.common.enums.OrderStatus; import com.ghy.common.enums.PayStatus; import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.poi.ExcelUtil; -import com.ghy.customer.domain.Customer; import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerService; diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 62e1f893..221f4eb2 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -12,7 +12,6 @@ import com.ghy.common.enums.ImgType; import com.ghy.common.utils.ExceptionUtil; import com.ghy.common.utils.StringUtils; import com.ghy.common.utils.poi.ExcelUtil; -import com.ghy.customer.domain.Customer; import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerService; @@ -43,7 +42,6 @@ import com.ghy.worker.domain.WorkerCertification; import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.WorkerService; import com.huifu.adapay.core.exception.BaseAdaPayException; -import org.apache.commons.collections.CollectionUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java index b4f3d048..58e4555b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderDetailsResponseVo.java @@ -1,6 +1,5 @@ package com.ghy.web.pojo.vo; -import com.ghy.common.annotation.Excel; import com.ghy.common.enums.OrderStatus; import com.ghy.common.utils.DateUtils; import com.ghy.common.utils.ObjectUtils; diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java index b366a518..3c3cca92 100644 --- a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java +++ b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailMapper.java @@ -1,7 +1,6 @@ package com.ghy.order.mapper; import com.ghy.order.domain.OrderDetail; -import com.ghy.order.domain.OrderMaster; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java index f79785c4..f86db39a 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderGoodsService.java @@ -1,6 +1,5 @@ package com.ghy.order.service; -import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderGoods; import java.util.List; diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java index 6a85372e..1cdb9ea3 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderGoodsServiceImpl.java @@ -1,6 +1,5 @@ package com.ghy.order.service.impl; -import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderGoods; import com.ghy.order.mapper.OrderGoodsMapper; import com.ghy.order.service.OrderGoodsService; diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml index 0a243574..315a5a74 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialChangeRecordMapper.xml @@ -16,7 +16,7 @@ select id, order_detail_id, change_money, status, pay_status, type, remark from financial_change_record - where order_detail_id = #{orderDetailId} and pay_status = 0; diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index d6e4f010..ccef13df 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -22,7 +22,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.List;