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

Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

Browse Source 
# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
#	jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
This commit is contained in:
Lemon
2025-04-15 10:01:48 +08:00
parent dfb46e0fe0 4ea7ae3549
commit 2ec926c0e7
14 changed files with 265 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml
View File

@@ -858,4 +858,23 @@
</if>
group by t1.station_id
</select>
<select id="queryStationAggregateData" resultType="com.jsowell.pile.vo.web.SplitConfigStationVO">
SELECT
t2.station_id AS stationId,
t3.station_name AS stationName,
t1.electricity_amount AS electricityAmount,
t1.service_amount AS serviceAmount,
t1.fee_amount AS feeAmount,
t1.trade_date AS tradeDate
FROM
order_split_record t1
JOIN order_basic_info t2 ON t1.order_code = t2.order_code
JOIN pile_station_info t3 ON t1.station_id = t3.id
WHERE
t1.adapay_member_id = #{adapayMemberId}
AND t1.del_flag = '0'
AND t1.trade_date BETWEEN #{startTime,jdbcType=VARCHAR} AND #{endTime,jdbcType=VARCHAR};
</select>
</mapper>