Merge branch 'feature-business-minigram' into dev

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

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java

@@ -459,4 +459,11 @@ public interface OrderBasicInfoMapper {
      * @return
      */
     List<IndexPlatformProfitVO> getInsuranceAmount(@Param("dto") IndexQueryDTO dto);
+
+    /**
+     * 批量查询充电枪信息
+     * @param chargingConnectorCodeList
+     * @return
+     */
+    List<PileConnectorInfoVO> batchQueryChargingConnectorInfo(@Param("pileConnectorCodes") List<String> chargingConnectorCodeList);
 }

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileConnectorInfoMapper.java

@@ -136,6 +136,14 @@ public interface PileConnectorInfoMapper {
      */
     List<ConnectorInfoVO> batchSelectConnectorList(@Param("stationIds") List<String> stationIds);
 
+    /**
+     * 此方法与上面方法一样，只是多加了status字段
+     * @param stationIds
+     * @param status
+     * @return
+     */
+    List<ConnectorInfoVO> batchSelectConnectorListByStatus(@Param("stationIds") List<String> stationIds, @Param("status") String status);
+
     /**
      * 查询异常设备数量
      * @param stationId

jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java

@@ -133,4 +133,11 @@ public interface PileStationInfoMapper {
 	 * @return
 	 */
 	List<UserFrequentedStationInfo> queryUserFrequentedStation(@Param("memberId") String memberId ,@Param("startTime") String startTime ,@Param("endTime") String endTime);
+
+	/**
+	 * 通过运营商ids查询站点ids
+	 * @param merchantIdList
+	 * @return
+	 */
+	List<String> getStationIdsByMerchantIds(@Param("merchantIds") List<String> merchantIdList);
 }