From c997ca502c1dde21683abee1fd81b5d7e5626678 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 11 Apr 2025 15:29:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=90=8E=E7=AE=A1=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=86=E8=B4=A6=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderSplitRecordServiceImpl.java | 3 +++ .../com/jsowell/pile/vo/web/OrderSplitRecordVO.java | 5 +++++ .../com/jsowell/pile/vo/web/SplitRecordInfoVO.java | 10 ++++++++++ .../resources/mapper/pile/OrderSplitRecordMapper.xml | 3 +++ 4 files changed, 21 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index b503d0cf8..41ce09d6c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -293,6 +293,9 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { .electricitySplitAmount(String.valueOf(orderSplitRecordVO.getElectricitySplitAmount())) .serviceSplitRatio(String.valueOf(orderSplitRecordVO.getServiceSplitRatio())) .serviceSplitAmount(String.valueOf(orderSplitRecordVO.getServiceSplitAmount())) + .feeAmount(String.valueOf(orderSplitRecordVO.getFeeAmount())) + .merchantId(String.valueOf(orderSplitRecordVO.getMerchantId())) + .merchantName(orderSplitRecordVO.getMerchantName()) .build(); orderSplitList.add(orderSplit); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java index d1d34b850..1b88eb6c3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderSplitRecordVO.java @@ -57,6 +57,11 @@ public class OrderSplitRecordVO { */ private String adapayMemberId; + /** + * 运营商id + */ + private String merchantId; + /** * 运营商名称 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java index c658ed9d2..2cf85a10c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/SplitRecordInfoVO.java @@ -47,6 +47,16 @@ public class SplitRecordInfoVO { */ private String adapayMemberId; + /** + * 运营商id + */ + private String merchantId; + + /** + * 运营商名称 + */ + private String merchantName; + /** * 电费分账比例 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml index 2ee8f3428..0139ee973 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml @@ -807,6 +807,8 @@ t2.order_amount AS orderAmount, t1.settle_amount AS settleAmount, t1.adapay_member_id AS adapayMemberId, + t3.id as merchantId, + t3.merchant_name as merchantName, t1.electricity_split_ratio AS electricitySplitRatio, t1.electricity_split_amount AS electricitySplitAmount, t1.service_split_ratio AS serviceSplitRatio, @@ -816,6 +818,7 @@ order_split_record t1 JOIN order_basic_info t2 ON t1.order_code = t2.order_code AND t1.del_flag = '0' + join pile_merchant_info t3 on t2.merchant_id = t3.id and t2.del_flag = '0' WHERE t1.station_id = #{dto.stationId,jdbcType=VARCHAR} AND t1.trade_date BETWEEN #{dto.startTime,jdbcType=VARCHAR} AND #{dto.endTime,jdbcType=VARCHAR}