查询用户可申请开票的订单列表

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

@@ -0,0 +1,20 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class QueryInvoiceRecordDTO {
+	private String memberId;
+
+	private LocalDateTime startTime;
+
+	private LocalDateTime endTime;
+}

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

@@ -135,9 +135,12 @@ public interface OrderBasicInfoMapper {
 	 *
 	 * @param memberId 会员id
 	 * @param orderStatusList 订单状态集合
+	 * @param dateTime
 	 * @return
 	 */
-	List<OrderVO> getListByMemberIdAndOrderStatus(@Param("memberId") String memberId, @Param("orderStatusList") List<String> orderStatusList);
+	List<OrderVO> getListByMemberIdAndOrderStatus(@Param("memberId") String memberId,
+												  @Param("orderStatusList") List<String> orderStatusList,
+												  @Param("dateTime") LocalDateTime dateTime);
 
 	/**
 	 * 将某订单修改为某状态

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

@@ -1,6 +1,7 @@
 package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderInvoiceRecord;
+import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
 
 import java.util.List;
 
@@ -58,4 +59,6 @@ public interface OrderInvoiceRecordMapper {
 	 * @return 结果
 	 */
 	public int deleteOrderInvoiceRecordByIds(Integer[] ids);
+
+	List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO dto);
 }

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

@@ -123,6 +123,8 @@ public interface IOrderBasicInfoService {
 	 */
 	List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList);
 
+	List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime);
+
 	/**
 	 * 结算订单退款和用户余额退款调这个方法
 	 */

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

@@ -1,6 +1,7 @@
 package com.jsowell.pile.service;
 
 import com.jsowell.pile.domain.OrderInvoiceRecord;
+import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
 
 import java.util.List;
 
@@ -27,6 +28,8 @@ public interface IOrderInvoiceRecordService {
 	 */
 	public List<OrderInvoiceRecord> selectOrderInvoiceRecordList(OrderInvoiceRecord orderInvoiceRecord);
 
+	List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO memberId);
+
 	/**
 	 * 新增申请开票
 	 *

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

@@ -1159,7 +1159,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
 	 */
 	@Override
 	public List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList) {
-		return orderBasicInfoMapper.getListByMemberIdAndOrderStatus(memberId, orderStatusList);
+		return orderBasicInfoMapper.getListByMemberIdAndOrderStatus(memberId, orderStatusList, null);
+	}
+
+	@Override
+	public List<OrderVO> getListByMemberIdAndOrderStatus(String memberId, List<String> orderStatusList, LocalDateTime dateTime) {
+		return orderBasicInfoMapper.getListByMemberIdAndOrderStatus(memberId, orderStatusList, dateTime);
 	}
 
 	/**

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

@@ -2,6 +2,7 @@ package com.jsowell.pile.service.impl;
 
 import com.jsowell.common.util.DateUtils;
 import com.jsowell.pile.domain.OrderInvoiceRecord;
+import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
 import com.jsowell.pile.mapper.OrderInvoiceRecordMapper;
 import com.jsowell.pile.service.IOrderInvoiceRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,11 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
 		return orderInvoiceRecordMapper.selectOrderInvoiceRecordList(orderInvoiceRecord);
 	}
 
+	@Override
+	public List<OrderInvoiceRecord> selectInvoiceRecordList(QueryInvoiceRecordDTO dto) {
+		return orderInvoiceRecordMapper.selectInvoiceRecordList(dto);
+	}
+
 	/**
 	 * 新增申请开票
 	 *