From e96f6fadf37b97d8dad45284b0d55dabb51b4d4a Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 4 Aug 2023 13:40:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=80=E7=A5=A8=20=20updat?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsowell/service/OrderService.java    |  8 ++------
 .../pile/service/IOrderInvoiceRecordService.java       |  7 +++++--
 .../service/impl/OrderInvoiceRecordServiceImpl.java    | 10 ++++++++++
 .../main/java/com/jsowell/pile/vo/uniapp/OrderVO.java  |  5 +++++
 .../resources/mapper/pile/OrderBasicInfoMapper.xml     |  9 +++++----
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index 7378889b3..ba12c2ddc 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -809,12 +809,8 @@ public class OrderService {
 		int i = 15;
 		// 查询最近15天完成的订单
 		LocalDateTime dateTime = LocalDateTime.now().plusDays(-i);
-		// 查询最近15天申请开票记录
-		QueryInvoiceRecordDTO build = QueryInvoiceRecordDTO.builder()
-				.memberId(dto.getMemberId())
-				.startTime(dateTime)
-				.build();
-		List<OrderInvoiceRecord> orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(build);
+		// 查询最近15天 会员的开票记录
+		List<OrderInvoiceRecord> orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(dto.getMemberId(), dateTime, LocalDateTime.now());
 		List<String> orderCodeList = orderInvoiceRecords.stream() // 转化为 Stream
 				.map(OrderInvoiceRecord::getOrderCodes) // 获取 OrderInvoiceRecord 中的 orderCodes 字符串
 				.flatMap(str -> Arrays.stream(str.split(","))) // 分隔逗号并转化为 Stream
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java
index 9bfe54a3c..1bc62d80d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java
@@ -4,6 +4,7 @@ import com.jsowell.pile.domain.OrderInvoiceRecord;
 import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
 import com.jsowell.pile.vo.web.InvoiceRecordVO;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ public interface IOrderInvoiceRecordService {
 	 * @param id 申请开票主键
 	 * @return 申请开票
 	 */
-	public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
+	OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
 
 	InvoiceRecordVO selectInvoiceTitleVO(Integer id);
 
@@ -29,10 +30,12 @@ public interface IOrderInvoiceRecordService {
 	 * @param orderInvoiceRecord 申请开票
 	 * @return 申请开票集合
 	 */
-	public List<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
+	List<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
 
 	List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO memberId);
 
+	List<OrderInvoiceRecord> selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime);
+
 	/**
 	 * 新增申请开票
 	 *
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java
index 35c1b1179..44ca0a173 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java
@@ -14,6 +14,7 @@ import com.jsowell.pile.vo.web.InvoiceRecordVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -85,6 +86,15 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
 		return orderInvoiceRecordMapper.selectInvoiceRecordList(dto);
 	}
 
+	@Override
+	public List<OrderInvoiceRecord> selectInvoiceRecordList(String memberId, LocalDateTime startTime, LocalDateTime endTime) {
+		QueryInvoiceRecordDTO dto = new QueryInvoiceRecordDTO();
+		dto.setMemberId(memberId);
+		dto.setStartTime(startTime);
+		dto.setEndTime(endTime);
+		return selectInvoiceRecordList(dto);
+	}
+
 	/**
 	 * 新增申请开票
 	 *
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java
index 258316443..dccd758a0 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java
@@ -34,6 +34,11 @@ public class OrderVO {
      */
     private String pileConnectorCode;
 
+    /**
+     * 运营商id
+     */
+    private String merchantId;
+
     /**
      * 站点id
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index b072e1430..f5b201c51 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -971,8 +971,9 @@
     <select id="getListByOrderCodes" resultType="com.jsowell.pile.vo.uniapp.OrderVO">
         SELECT t1.order_code               as orderCode,
                t1.order_status             as orderStatus,
-               t1.reason,
-               t1.station_id,
+               t1.reason                   as reason,
+               t1.merchant_id              as merchantId,
+               t1.station_id               as stationId,
                t3.station_name             as stationName,
                t1.pile_sn                  as pileSn,
                t1.connector_code           as connectorCode,
@@ -985,8 +986,8 @@
                t2.total_electricity_amount as totalElectricityAmount,
                t2.total_service_amount     as totalServiceAmount
         from order_basic_info t1
-                 join order_detail t2 on t1.order_code = t2.order_code
-                 join pile_station_info t3 on t1.station_id = t3.id
+        join order_detail t2 on t1.order_code = t2.order_code
+        join pile_station_info t3 on t1.station_id = t3.id
         where t1.del_flag = '0'
           and t1.order_code in
         <foreach collection="orderCodes" item="orderCode" open="(" separator="," close=")">