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

jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBillingTemplateController.java

@@ -167,6 +167,17 @@ public class PileBillingTemplateController extends BaseController {
 		return getDataTable(list);
 	}
 
+	/**
+	 * 查询站点优惠计费模板
+	 */
+	@GetMapping("/queryStationPreferentialBillingTemplateList/{stationId}")
+	public TableDataInfo queryStationPreferentialBillingTemplateList(@PathVariable("stationId") String stationId) {
+		logger.info("查询站点优惠计费模板 param:{}", stationId);
+		List<BillingTemplateVO> list = pileBillingTemplateService.queryStationPreferentialBillingTemplateList(stationId);
+		logger.info("查询站点优惠计费模板 result：{}", JSONObject.toJSONString(list));
+		return getDataTable(list);
+	}
+
 	/**
 	 * 发布计费模板
 	 */

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

@@ -103,7 +103,8 @@ public interface PileBillingTemplateMapper {
 	 * @return
 	 */
 	List<BillingTemplateVO> queryStationBillingTemplateListWithAuth(@Param("stationId") String stationId,
-																	@Param("stationDeptIds") List<String> stationDeptIds);
+																	@Param("stationDeptIds") List<String> stationDeptIds,
+																	@Param("memberFlag") String memberFlag);
 
 	/**
 	 * 根据站点id查询站点计费模板列表

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

@@ -91,6 +91,8 @@ public interface PileBillingTemplateService {
 	 */
 	List<BillingTemplateVO> queryStationBillingTemplateList(String stationId);
 
+	List<BillingTemplateVO> queryStationPreferentialBillingTemplateList(String stationId);
+
 	/**
 	 * 查询站点计费模板
 	 *

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

@@ -547,7 +547,20 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
             // 为空表示没有权限，返回空数组
             return Lists.newArrayList();
         }
-        return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds());
+        return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds(), null);
+    }
+
+    @Override
+    public List<BillingTemplateVO> queryStationPreferentialBillingTemplateList(String stationId) {
+        if (StringUtils.isBlank(stationId)) {
+            return Lists.newArrayList();
+        }
+        AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap();
+        if (authorizedMap == null) {
+            // 为空表示没有权限，返回空数组
+            return Lists.newArrayList();
+        }
+        return pileBillingTemplateMapper.queryStationBillingTemplateListWithAuth(stationId, authorizedMap.getStationDeptIds(), Constants.ONE);
     }
 
     /**

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

@@ -370,6 +370,9 @@
         where
             t2.del_flag = '0'
           and t2.station_id = #{stationId,jdbcType=VARCHAR}
+        <if test="memberFlag != null and memberFlag != ''">
+            and t2.member_flag = #{memberFlag,jdbcType=VARCHAR}
+        </if>
         <!--数据范围过滤-->
         <if test="stationDeptIds != null and stationDeptIds.size() != 0">
             and t1.dept_id in