autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 10:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增 宁夏交投 相关service方法

Browse Source
This commit is contained in:
Lemon
2023-11-14 14:06:50 +08:00
parent 7b0b094211
commit 9d79c635ec
10 changed files with 108 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-pile/src/main/java/com/jsowell/pile/dto/ningxiajiaotou/NXJTQueryOrdersInfoDTO.java
View File

@@ -17,4 +17,8 @@ public class NXJTQueryOrdersInfoDTO {
private String licensePlateNumber;
private String operatorId;
private String startTime;
private String endTime;
}

5
jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
View File

@@ -4,6 +4,7 @@ import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.nanrui.NROrderInfoVO;
@@ -261,8 +262,8 @@ public interface OrderBasicInfoMapper {
/**
* 根据车牌号查询订单信息（宁夏交投 用）
* @param licensePlateNumber
* @param dto
* @return
*/
List<OrderVO> getOrderInfoByLicensePlateNumber(String licensePlateNumber);
List<OrderVO> getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java
View File

@@ -11,6 +11,7 @@ import com.jsowell.pile.domain.OrderDetail;
import com.jsowell.pile.domain.SettleOrderReport;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
@@ -374,8 +375,8 @@ public interface IOrderBasicInfoService {
/**
* 根据车牌号查询订单信息（宁夏交投 用）
* @param licensePlateNumber
* @param dto
* @return
*/
List<OrderVO> getOrderInfoByLicensePlateNumber(String licensePlateNumber);
List<OrderVO> getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto);
}

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -39,6 +39,7 @@ import com.jsowell.common.util.id.SnowflakeIdWorker;
import com.jsowell.pile.domain.*;
import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
import com.jsowell.pile.mapper.OrderBasicInfoMapper;
import com.jsowell.pile.service.*;
import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
@@ -3490,7 +3491,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
* @return
*/
@Override
public List<OrderVO> getOrderInfoByLicensePlateNumber(String licensePlateNumber) {
return orderBasicInfoMapper.getOrderInfoByLicensePlateNumber(licensePlateNumber);
public List<OrderVO> getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto) {
return orderBasicInfoMapper.getOrderInfoByNXJT(dto);
}
}

40
jsowell-pile/src/main/java/com/jsowell/pile/vo/ningxiajiaotou/NXJTOrderVO.java Normal file
View File

@@ -0,0 +1,40 @@
package com.jsowell.pile.vo.ningxiajiaotou;
import lombok.Data;
import java.math.BigDecimal;
/**
* 宁夏交投订单VO
*
* @author Lemon
* @Date 2023/11/14 10:50:37
*/
@Data
public class NXJTOrderVO {
/**
* 充电消费时间
*/
private String chargeTime;
/**
* 车牌号码
*/
private String licensePlateNumber;
/**
* 站点名称
*/
private String stationName;
/**
* 订单金额
*/
private BigDecimal orderAmount;
/**
* 车牌颜色
* (1-绿色；2-蓝色)
*/
private Integer licensePlateNumberColor;
}

5
jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java
View File

@@ -74,6 +74,11 @@ public class OrderVO {
*/
private BigDecimal settleAmount;
/**
* 车牌号
*/
private String licensePlateNumber;
/**
* 订单状态
*/

16
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -1217,17 +1217,25 @@
and t1.pay_mode = '4'
</select>
<select id="getOrderInfoByLicensePlateNumber" resultType="com.jsowell.pile.vo.uniapp.OrderVO">
<select id="getOrderInfoByNXJT" resultType="com.jsowell.pile.vo.uniapp.OrderVO">
SELECT
t1.charge_start_time AS startTime,
t1.station_id AS stationId,
t2.station_name AS stationName,
t1.plate_number as licensePlateNumber,
t1.order_amount AS orderAmount
FROM
order_basic_info t1
JOIN pile_station_info t2 ON t1.station_id = t2.id
AND t1.del_flag = '0'
where
t1.plate_number = #{licensePlateNumber,jdbcType=VARCHAR}
WHERE t1.del_flag = '0'
<if test="licensePlateNumber != null and licensePlateNumber != ''">
AND t1.plate_number = #{licensePlateNumber,jdbcType=VARCHAR}
</if>
<if test="startTime != null and startTime != ''">
AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
</if>
<if test="endTime != null and endTime != ''">
AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
</if>
</select>
</mapper>