From dd59ce9348217ec57a98ff5a346bad35e3ee736e Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Sat, 13 May 2023 17:51:16 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OrderBasicInfoServiceImpl.java       | 30 +++++++++++++++++++
 .../impl/PileBasicInfoServiceImpl.java        |  2 --
 .../mapper/pile/OrderBasicInfoMapper.xml      |  8 ++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 448eef345..dd494d3e9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -55,6 +55,8 @@ import com.jsowell.pile.service.IPileAuthCardService;
 import com.jsowell.pile.service.IPileBasicInfoService;
 import com.jsowell.pile.service.IPileBillingTemplateService;
 import com.jsowell.pile.service.IPileConnectorInfoService;
+import com.jsowell.pile.service.IPileMerchantInfoService;
+import com.jsowell.pile.service.IPileStationInfoService;
 import com.jsowell.pile.service.OrderMonitorDataService;
 import com.jsowell.pile.service.WechatPayService;
 import com.jsowell.pile.service.WxpayCallbackRecordService;
@@ -159,6 +161,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 	@Autowired
 	private OrderMonitorDataService orderMonitorDataService;
 
+	@Autowired
+	private IPileStationInfoService pileStationInfoService;
+
+	@Autowired
+	private IPileMerchantInfoService pileMerchantInfoService;
+
 	/**
 	 * 条件查询订单基本信息
 	 *
@@ -1094,6 +1102,28 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 	 */
 	@Override
 	public List<IndexOrderInfoVO> getIndexOrderInfo(IndexQueryDTO dto) {
+		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+		if (authorizedMap == null) {
+			return Lists.newArrayList();
+		}
+		List<String> stationIdList = Lists.newArrayList();
+		List<String> stationDeptIds = authorizedMap.getStationDeptIds();
+		if (CollectionUtils.isNotEmpty(stationDeptIds)) {
+			// 根据部门id查询站点id
+			List<String> list = pileStationInfoService.queryByStationDeptIds(stationDeptIds);
+			if (CollectionUtils.isNotEmpty(list)) {
+				stationIdList.addAll(list);
+			}
+		}
+		List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
+		if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
+			// 根据运营商部门id查询下面所有站点id
+			List<String> list = pileMerchantInfoService.queryByMerchantDeptIds(merchantDeptIds);
+			if (CollectionUtils.isNotEmpty(list)) {
+				stationIdList.addAll(list);
+			}
+		}
+		dto.setStationIdList(stationIdList);
 		return orderBasicInfoMapper.getIndexOrderInfo(dto);
 	}
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 54ad35973..c1be265c5 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -569,8 +569,6 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 		if (authorizedMap == null) {
 			return new IndexGeneralSituationVO();
 		}
-		// dto.setStationDeptIds(authorizedMap.getStationDeptIds());
-		// dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds());
 		List<String> stationIdList = Lists.newArrayList();
 		List<String> stationDeptIds = authorizedMap.getStationDeptIds();
 		if (CollectionUtils.isNotEmpty(stationDeptIds)) {
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 31008f5e8..f41d1edea 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -779,7 +779,13 @@
             date(t1.create_time) >= DATE_SUB(CURDATE(),INTERVAL 30 day)
           and t1.order_status = '6'
             <if test="dto.stationId != null and dto.stationId != ''">
-                and t1,station_id = #{dto.stationId,jdbcType=VARCHAR}
+                and t1.station_id = #{dto.stationId,jdbcType=VARCHAR}
+            </if>
+            <if test="dto.stationIdList != null and dto.stationIdList.size() != 0">
+                and t1.station_id in
+                <foreach collection="dto.stationIdList" item="item" open="(" separator="," close=")">
+                    #{item,jdbcType=VARCHAR}
+                </foreach>
             </if>
         group by DATE_FORMAT(t1.create_time,'%Y-%m-%d')
     </select>