Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhuyifan
2024-12-10 09:39:32 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
354f857e75d1916b152c05c49b99b7d4abac5228
354f857e
1 parent
67c9e11b
fix
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
src/main/java/com/infoloop/tianting/service/impl/SettlementServiceImpl.java
View file @
354f857
...
...
@@ -8,18 +8,15 @@ import com.infoloop.tianting.exception.ClientEndExceptions.BusinessException;
import
com.infoloop.tianting.exception.ErrorCodeEnum
;
import
com.infoloop.tianting.menuservice.SingleMenuDetailRpcResponse
;
import
com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto
;
import
com.infoloop.tianting.model.dto.SettlementDTO
;
import
com.infoloop.tianting.model.dto.SettlementDTO.SettlementDataDto
;
import
com.infoloop.tianting.model.dto.SettlementDTO.SettlementMenuSkuDto
;
import
com.infoloop.tianting.model.dto.SettlementDTO.SettlementRequestDto
;
import
com.infoloop.tianting.service.SettlementService
;
import
com.infoloop.tianting.service.client.InventoryServiceRpcClient
;
import
com.infoloop.tianting.service.client.MenuServiceRpcClient
;
import
com.infoloop.tianting.service.client.OperatorServiceRpcClient
;
import
com.infoloop.tianting.service.client.OrderServiceRpcClient
;
import
com.infoloop.tianting.service.client.SkuServiceRpcClient
;
import
com.infoloop.tianting.utils.DateUtil
;
import
java.util.Comparator
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.poi.ss.usermodel.Cell
;
...
...
@@ -34,6 +31,7 @@ import org.springframework.stereotype.Service;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -50,12 +48,12 @@ public class SettlementServiceImpl implements SettlementService {
@Override
public
ByteArrayOutputStream
generateOrderSettlementExcel
(
SettlementRequestDto
settlementRequest
)
{
final
var
startDate
=
settlementRequest
.
getTimeStart
().
toLocalDate
().
atStartOfDay
();
final
var
endDate
=
settlementRequest
.
getTimeEnd
().
toLocalDate
().
plusDays
(
1
).
atStartOfDay
();
final
var
operatorLoginInfo
=
LoginContextHolder
.
getLoginInfo
();
final
int
enterpriseId
=
LoginContextHolder
.
hasLogin
()
?
operatorLoginInfo
.
getEnterpriseId
()
:
settlementRequest
.
getEnterpriseId
();
final
var
queryOrderDto
=
QueryOrderByConditionDto
.
builder
()
.
enterpriseId
(
LoginContextHolder
.
hasLogin
()
?
operatorLoginInfo
.
getEnterpriseId
()
:
settlementRequest
.
getEnterpriseId
()
)
.
enterpriseId
(
enterpriseId
)
.
shouldFilterCreatedAtTimeStart
(
true
)
.
createdAtTimeStart
(
startDate
)
.
shouldFilterCreatedAtTimeEnd
(
true
)
...
...
@@ -79,10 +77,10 @@ public class SettlementServiceImpl implements SettlementService {
SingleClientCustomerOrderRpcResponse:
:
getMenuId
).
distinct
()
.
collect
(
Collectors
.
toList
());
final
var
menuList
=
menuServiceRpcClient
.
getMenusByIds
(
operatorLoginInfo
.
getEnterpriseId
()
,
menuIds
)
.
getMenusByIds
(
enterpriseId
,
menuIds
)
.
getResponsesList
();
final
var
menuDetailList
=
menuServiceRpcClient
.
queryMenuDetailsByMenuIds
(
operatorLoginInfo
.
getEnterpriseId
()
,
menuIds
).
getResponsesList
();
enterpriseId
,
menuIds
).
getResponsesList
();
Map
<
String
,
Map
<
String
,
List
<
SettlementMenuSkuDto
>>>
classifyOrders
=
new
HashMap
<>();
...
...
@@ -178,7 +176,7 @@ public class SettlementServiceImpl implements SettlementService {
}
}
final
var
client
=
inventoryServiceRpcClient
.
getClientById
(
operatorLoginInfo
.
getEnterpriseId
()
,
final
var
client
=
inventoryServiceRpcClient
.
getClientById
(
enterpriseId
,
settlementRequest
.
getClientId
()).
getClient
();
final
var
settlementDataDto
=
SettlementDataDto
.
builder
()
.
classifyOrders
(
classifyOrders
)
...
...
Please
register
or
login
to post a comment