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}