yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

可开发票的时间由3个月数据放宽至12个月

Browse Source
This commit is contained in:
yuyang 2022-05-25 14:18:28 +08:00
parent 68bcc1aeda
commit d8a6be7b08
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcInvoiceServiceImpl.java
View File

@ -274,7 +274,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
*/ */
@Override @Override
public InvoicedOrderResponse findUserHistoryOrders(InvoicedOrdersRequest invoicedOrdersRequest) { public InvoicedOrderResponse findUserHistoryOrders(InvoicedOrdersRequest invoicedOrdersRequest) {
System.out.println("<<<<<<<<<<111<<<<<<<<<查询开票信息>>>>>>>>>>111>>>>>>>>"+invoicedOrdersRequest.toString());
//自动生成当前时间 //自动生成当前时间
if (invoicedOrdersRequest.getCurrentTime() == null || "".equals(invoicedOrdersRequest.getCurrentTime())) { if (invoicedOrdersRequest.getCurrentTime() == null || "".equals(invoicedOrdersRequest.getCurrentTime())) {
Date currentDate = new Date(); Date currentDate = new Date();
@ -283,8 +283,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
} }
//先查询该用户被锁定了的订单，过滤掉它 //先查询该用户被锁定了的订单，过滤掉它
List<Integer> lockOrderNumberList = xhpcInvoiceMapHistoryOrderMapper.findLockOrdersByUserIdAndUserType(invoicedOrdersRequest); List<Integer> lockOrderNumberList = xhpcInvoiceMapHistoryOrderMapper.findLockOrdersByUserIdAndUserType(invoicedOrdersRequest);
System.out.println("<<<<<<<<<<111<<<<<<<<<询该用户被锁定了的订单>>>>>>>>>>111>>>>>>>>");
//查询该用户3个月内可以开发票的历史订单 //查询该用户3个月内可以开发票的历史订单
List<Map<String, Object>> xhpcHistoryOrderList = xhpcHistoryOrderMapper.findByCondition(invoicedOrdersRequest, lockOrderNumberList); List<Map<String, Object>> xhpcHistoryOrderList = xhpcHistoryOrderMapper.findByCondition(invoicedOrdersRequest, lockOrderNumberList);
System.out.println("<<<<<<<<<<111<<<<<<<<<用户3个月内可以开发票>>>>>>>>>>111>>>>>>>>");
InvoicedOrderResponse invoicedOrderResponse = new InvoicedOrderResponse(); InvoicedOrderResponse invoicedOrderResponse = new InvoicedOrderResponse();
//没有则直接返回空对象出去 //没有则直接返回空对象出去
if (xhpcHistoryOrderList.size() == 0) { if (xhpcHistoryOrderList.size() == 0) {
@ -329,7 +331,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService {
int count = 0; int count = 0;
for (String key : keyList) { for (String key : keyList) {
count++; count++;
if (count == 4) { if (count == 13) {
break; break;
} }
ItemsDTO itemsDTO = new ItemsDTO(); ItemsDTO itemsDTO = new ItemsDTO();