From 3cc3f08ff8315d5ab8371901893fe8d063df9c5c Mon Sep 17 00:00:00 2001 From: ZZ Date: Wed, 13 Oct 2021 17:47:45 +0800 Subject: [PATCH] compile issue reduce to 1 but not 0... --- evcs-modules/evcs-core/pom.xml | 5 ----- .../java/com/xhpc/evcs/api/EquipChargeStatusController.java | 3 +-- .../xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java | 4 ++-- .../com/xhpc/evcs/jpa/StatisticTimeIntervalRepository.java | 2 +- .../java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java | 2 +- .../com/xhpc/order/service/IXhpcRealTimeOrderService.java | 5 +++-- 6 files changed, 8 insertions(+), 13 deletions(-) diff --git a/evcs-modules/evcs-core/pom.xml b/evcs-modules/evcs-core/pom.xml index 4964f1c9..bf41288f 100644 --- a/evcs-modules/evcs-core/pom.xml +++ b/evcs-modules/evcs-core/pom.xml @@ -10,11 +10,6 @@ evcs-core - - com.xhpc - common - 1.0 - com.xhpc evcs-common diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java index a816b063..31639712 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java @@ -1,13 +1,12 @@ package com.xhpc.evcs.api; -import com.xhpc.evcs.domain.ChargeOrderInfo; +import com.xhpc.common.domain.XhpcHistoryOrder; import com.xhpc.evcs.dto.*; import com.xhpc.evcs.encryption.EvcsConst; import com.xhpc.evcs.http.ServerInternalException; import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository; import com.xhpc.evcs.utils.DateUtil; import com.xhpc.evcs.utils.JSONUtil; -import com.xhpc.order.domain.XhpcHistoryOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java index bced9993..4bc82e01 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java @@ -1,8 +1,9 @@ package com.xhpc.evcs.cd; +import com.xhpc.common.domain.XhpcHistoryOrder; +import com.xhpc.common.domain.XhpcStatisticsTimeInterval; import com.xhpc.evcs.domain.AuthSecretToken; import com.xhpc.evcs.domain.EtOrderMapping; -import com.xhpc.evcs.domain.XhpcStatisticsTimeInterval; import com.xhpc.evcs.dto.CDChargeOrder4BonusInfoRes; import com.xhpc.evcs.dto.CDChargeOrderInfo4BonusReq; import com.xhpc.evcs.dto.CommonRequest; @@ -12,7 +13,6 @@ import com.xhpc.evcs.jpa.OrderMappingRepository; import com.xhpc.evcs.jpa.StatisticTimeIntervalRepository; import com.xhpc.evcs.jpa.XhpcHistoryOrderRepository; import com.xhpc.evcs.utils.JSONUtil; -import com.xhpc.order.domain.XhpcHistoryOrder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/StatisticTimeIntervalRepository.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/StatisticTimeIntervalRepository.java index a23ab615..93dc476d 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/StatisticTimeIntervalRepository.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/StatisticTimeIntervalRepository.java @@ -1,6 +1,6 @@ package com.xhpc.evcs.jpa; -import com.xhpc.evcs.domain.XhpcStatisticsTimeInterval; +import com.xhpc.common.domain.XhpcStatisticsTimeInterval; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.query.QueryByExampleExecutor; diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java index bc4416ac..0fd744b1 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java @@ -1,6 +1,6 @@ package com.xhpc.evcs.jpa; -import com.xhpc.order.domain.XhpcHistoryOrder; +import com.xhpc.common.domain.XhpcHistoryOrder; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.repository.query.QueryByExampleExecutor; diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java index 8130bcfa..d848687e 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java @@ -5,7 +5,6 @@ import com.xhpc.common.data.redis.CacheRealtimeData; import com.xhpc.order.domain.*; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -116,7 +115,9 @@ public interface IXhpcRealTimeOrderService { * @param type 0 不发短信 1发短信 * @param vinNormal VUN 码 */ - void addSettlement(BigDecimal powerPrice, BigDecimal servicePrice, BigDecimal money, BigDecimal surplusPowerPrice, BigDecimal surplusServicePrice, XhpcChargeOrder xhpcChargeOrder, Long userId, Map userMessage,Integer type,String vinNormal,XhpcHistoryOrder xhpcHistoryOrder); + void addSettlement(BigDecimal powerPrice, BigDecimal servicePrice, BigDecimal money, BigDecimal surplusPowerPrice, + BigDecimal surplusServicePrice, XhpcChargeOrder xhpcChargeOrder, Long userId, + Map userMessage, Integer type, String vinNormal, XhpcHistoryOrder xhpcHistoryOrder); /** * 添加redis到数据库