mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-05-17 16:28:41 +08:00
后管页面分润数据新增 结算时间字段
This commit is contained in:
@@ -307,6 +307,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
|
|||||||
|
|
||||||
SplitRecordInfoVO vo = SplitRecordInfoVO.builder()
|
SplitRecordInfoVO vo = SplitRecordInfoVO.builder()
|
||||||
.orderCode(orderCode)
|
.orderCode(orderCode)
|
||||||
|
.settlementTime(splitRecordVOList.get(0).getSettlementTime())
|
||||||
.orderAmount(splitRecordVOList.get(0).getOrderAmount())
|
.orderAmount(splitRecordVOList.get(0).getOrderAmount())
|
||||||
.settleAmount(String.valueOf(splitRecordVOList.get(0).getSettleAmount()))
|
.settleAmount(String.valueOf(splitRecordVOList.get(0).getSettleAmount()))
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,11 @@ public class OrderSplitRecordVO {
|
|||||||
*/
|
*/
|
||||||
private String stationId;
|
private String stationId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 结算时间
|
||||||
|
*/
|
||||||
|
private String settlementTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单金额
|
* 订单金额
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -26,6 +26,11 @@ public class SplitRecordInfoVO {
|
|||||||
*/
|
*/
|
||||||
private String orderAmount;
|
private String orderAmount;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 结算时间
|
||||||
|
*/
|
||||||
|
private String settlementTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 结算金额
|
* 结算金额
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -803,6 +803,7 @@
|
|||||||
<select id="queryOrderSplitData" resultType="com.jsowell.pile.vo.web.OrderSplitRecordVO">
|
<select id="queryOrderSplitData" resultType="com.jsowell.pile.vo.web.OrderSplitRecordVO">
|
||||||
SELECT
|
SELECT
|
||||||
t1.order_code AS orderCode,
|
t1.order_code AS orderCode,
|
||||||
|
t2.settlement_time as settlementTime,
|
||||||
t1.station_id AS stationId,
|
t1.station_id AS stationId,
|
||||||
t2.order_amount AS orderAmount,
|
t2.order_amount AS orderAmount,
|
||||||
t1.settle_amount AS settleAmount,
|
t1.settle_amount AS settleAmount,
|
||||||
|
|||||||
Reference in New Issue
Block a user