Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOccupyOrderDTO.java

@@ -0,0 +1,7 @@
+package com.jsowell.pile.dto;/**
+ * TODO
+ *
+ * @Date 2023/8/18 9:00
+ * @author  Lemon 
+ */public class GenerateOccupyOrderDTO {
+}

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationDTO.java

@@ -6,6 +6,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 站点管理前台参数
  *
@@ -73,4 +75,9 @@ public class QueryStationDTO extends BaseEntity {
      * 站点二维码前缀
      */
     private String qrcodePrefix;
+
+    /**
+     * 运营商部门id
+     */
+    private List<String> merchantDeptId;
 }

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

@@ -96,4 +96,11 @@ public interface PileMerchantInfoMapper {
 	 * @return
 	 */
 	String getFirstLevelMerchantIdByAppId(String appId);
+
+	/**
+	 * 通过appid查询运营商部门id
+	 * @param appId
+	 * @return
+	 */
+    List<String> getDeptIdsByAppId(@Param("appId") String appId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/IPileMerchantInfoService.java

@@ -98,4 +98,11 @@ public interface IPileMerchantInfoService {
     List<PileMerchantInfo> queryFirstLevelMerchant();
 
     String queryAppIdByMerchantId(String merchantId);
+
+	/**
+	 * 通过appid获取运营商部门id
+	 * @param appId
+	 * @return
+	 */
+	List<String> getDeptIdsByAppId(String appId);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java

@@ -378,5 +378,15 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
 		return appId;
 	}
 
+	/**
+	 * 通过appid查询运营商部门id
+	 * @param appId
+	 * @return
+	 */
+    @Override
+    public List<String> getDeptIdsByAppId(String appId) {
+        return pileMerchantInfoMapper.getDeptIdsByAppId(appId);
+    }
+
 
 }