yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compile issue reduce to 1 but not 0...

Browse Source
This commit is contained in:
ZZ 2021-10-13 17:47:45 +08:00
parent 365e5a8c5a
commit 3cc3f08ff8
6 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
evcs-modules/evcs-core/pom.xml
View File

@ -10,11 +10,6 @@
<artifactId>evcs-core</artifactId>
<dependencies>
<dependency>
<groupId>com.xhpc</groupId>
<artifactId>common</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.xhpc</groupId>
<artifactId>evcs-common</artifactId>

3
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/EquipChargeStatusController.java
View File

@ -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;

4
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/cd/NotificationChargeOrderInfo4BonusTask.java
View File

@ -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;

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/StatisticTimeIntervalRepository.java
View File

@ -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;

2
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/jpa/XhpcHistoryOrderRepository.java
View File

@ -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;

5
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/IXhpcRealTimeOrderService.java
View File

@ -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<String, Object> userMessage,Integer type,String vinNormal,XhpcHistoryOrder xhpcHistoryOrder);
void addSettlement(BigDecimal powerPrice, BigDecimal servicePrice, BigDecimal money, BigDecimal surplusPowerPrice,
BigDecimal surplusServicePrice, XhpcChargeOrder xhpcChargeOrder, Long userId,
Map<String, Object> userMessage, Integer type, String vinNormal, XhpcHistoryOrder xhpcHistoryOrder);
/**
* 添加redis到数据库