Merge branch 'feature-business-minigram' into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -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>

jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml

@@ -319,4 +319,27 @@
           AND
             t1.del_flag = '0'
     </select>
+
+    <select id="batchSelectConnectorListByStatus" resultType="com.jsowell.pile.vo.base.ConnectorInfoVO">
+        SELECT
+        t1.pile_connector_code as pileConnectorCode,
+        t2.station_id as stationId,
+        t1.STATUS as connectorStatus,
+        t1.pile_sn as pileSn,
+        t2.model_id as modelId,
+        t3.speed_type as chargingType,
+        t3.rated_power as ratedPower
+        FROM
+        pile_connector_info t1
+        JOIN pile_basic_info t2 ON (t1.pile_sn = t2.sn AND t2.del_flag = '0')
+        JOIN pile_model_info t3 ON (t2.model_id = t3.id AND t3.del_flag = '0')
+        WHERE t1.del_flag = '0'
+        AND t2.station_id in
+        <foreach collection="stationIds" item="stationId" open="(" separator="," close=")">
+            #{stationId, jdbcType=VARCHAR}
+        </foreach>
+        <if test="status != null and status != ''">
+            AND t1.status = #{status,jdbcType=VARCHAR}
+        </if>
+    </select>
 </mapper>

jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml

@@ -743,4 +743,15 @@
         ORDER BY
             chargeNum DESC;
     </select>
+
+    <select id="getStationIdsByMerchantIds" resultType="java.lang.String">
+        select
+            id
+        from
+            pile_station_info
+        where merchant_id in
+            <foreach collection="merchantIds" item="merchantId" open="(" separator="," close=")">
+                #{merchantId,jdbcType=VARCHAR}
+            </foreach>
+    </select>
 </mapper>