Merge branch 'feature-business-minigram' into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
This commit is contained in:
Lemon
2026-01-07 10:49:06 +08:00
16 changed files with 359 additions and 48 deletions

View File

@@ -3592,4 +3592,17 @@
and `settlement_time` BETWEEN #{dto.startTime,jdbcType=VARCHAR} and #{dto.endTime,jdbcType=VARCHAR}
group by DATE_FORMAT(settlement_time, '%Y-%m-%d');
</select>
<select id="batchQueryChargingConnectorInfo"
resultType="com.jsowell.pile.vo.web.PileConnectorInfoVO">
select
order_code as orderCode,
transaction_code as transactionCode,
pile_connector_code as pileConnectorCode
from order_basic_info where pile_connector_code in
<foreach item="pileConnectorCode" collection="pileConnectorCodes" separator="," open="(" close=")">
#{pileConnectorCode}
</foreach>
and order_status = '1'
</select>
</mapper>