jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
354f857e 1 parent 67c9e11b

fix

Inline Side-by-side
Showing 1 changed file with 6 additions and 8 deletions
...@@ -8,18 +8,15 @@ import com.infoloop.tianting.exception.ClientEndExceptions.BusinessException; ...@@ -8,18 +8,15 @@ import com.infoloop.tianting.exception.ClientEndExceptions.BusinessException;
8 import com.infoloop.tianting.exception.ErrorCodeEnum; 8 import com.infoloop.tianting.exception.ErrorCodeEnum;
9 import com.infoloop.tianting.menuservice.SingleMenuDetailRpcResponse; 9 import com.infoloop.tianting.menuservice.SingleMenuDetailRpcResponse;
10 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto; 10 import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
11 -import com.infoloop.tianting.model.dto.SettlementDTO;
12 import com.infoloop.tianting.model.dto.SettlementDTO.SettlementDataDto; 11 import com.infoloop.tianting.model.dto.SettlementDTO.SettlementDataDto;
13 import com.infoloop.tianting.model.dto.SettlementDTO.SettlementMenuSkuDto; 12 import com.infoloop.tianting.model.dto.SettlementDTO.SettlementMenuSkuDto;
14 import com.infoloop.tianting.model.dto.SettlementDTO.SettlementRequestDto; 13 import com.infoloop.tianting.model.dto.SettlementDTO.SettlementRequestDto;
15 import com.infoloop.tianting.service.SettlementService; 14 import com.infoloop.tianting.service.SettlementService;
16 import com.infoloop.tianting.service.client.InventoryServiceRpcClient; 15 import com.infoloop.tianting.service.client.InventoryServiceRpcClient;
17 import com.infoloop.tianting.service.client.MenuServiceRpcClient; 16 import com.infoloop.tianting.service.client.MenuServiceRpcClient;
18 -import com.infoloop.tianting.service.client.OperatorServiceRpcClient;
19 import com.infoloop.tianting.service.client.OrderServiceRpcClient; 17 import com.infoloop.tianting.service.client.OrderServiceRpcClient;
20 import com.infoloop.tianting.service.client.SkuServiceRpcClient; 18 import com.infoloop.tianting.service.client.SkuServiceRpcClient;
21 import com.infoloop.tianting.utils.DateUtil; 19 import com.infoloop.tianting.utils.DateUtil;
22 -import java.util.Comparator;
23 import lombok.RequiredArgsConstructor; 20 import lombok.RequiredArgsConstructor;
24 import lombok.extern.slf4j.Slf4j; 21 import lombok.extern.slf4j.Slf4j;
25 import org.apache.poi.ss.usermodel.Cell; 22 import org.apache.poi.ss.usermodel.Cell;
...@@ -34,6 +31,7 @@ import org.springframework.stereotype.Service; ...@@ -34,6 +31,7 @@ import org.springframework.stereotype.Service;
34 import java.io.ByteArrayOutputStream; 31 import java.io.ByteArrayOutputStream;
35 import java.io.IOException; 32 import java.io.IOException;
36 import java.util.ArrayList; 33 import java.util.ArrayList;
34 +import java.util.Comparator;
37 import java.util.HashMap; 35 import java.util.HashMap;
38 import java.util.List; 36 import java.util.List;
39 import java.util.Map; 37 import java.util.Map;
...@@ -50,12 +48,12 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -50,12 +48,12 @@ public class SettlementServiceImpl implements SettlementService {
50 48
51 @Override 49 @Override
52 public ByteArrayOutputStream generateOrderSettlementExcel(SettlementRequestDto settlementRequest) { 50 public ByteArrayOutputStream generateOrderSettlementExcel(SettlementRequestDto settlementRequest) {
53 -
54 final var startDate = settlementRequest.getTimeStart().toLocalDate().atStartOfDay(); 51 final var startDate = settlementRequest.getTimeStart().toLocalDate().atStartOfDay();
55 final var endDate = settlementRequest.getTimeEnd().toLocalDate().plusDays(1).atStartOfDay(); 52 final var endDate = settlementRequest.getTimeEnd().toLocalDate().plusDays(1).atStartOfDay();
56 final var operatorLoginInfo = LoginContextHolder.getLoginInfo(); 53 final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
54 + final int enterpriseId = LoginContextHolder.hasLogin() ? operatorLoginInfo.getEnterpriseId() : settlementRequest.getEnterpriseId();
57 final var queryOrderDto = QueryOrderByConditionDto.builder() 55 final var queryOrderDto = QueryOrderByConditionDto.builder()
58 - .enterpriseId(LoginContextHolder.hasLogin() ? operatorLoginInfo.getEnterpriseId() : settlementRequest.getEnterpriseId()) 56 + .enterpriseId(enterpriseId)
59 .shouldFilterCreatedAtTimeStart(true) 57 .shouldFilterCreatedAtTimeStart(true)
60 .createdAtTimeStart(startDate) 58 .createdAtTimeStart(startDate)
61 .shouldFilterCreatedAtTimeEnd(true) 59 .shouldFilterCreatedAtTimeEnd(true)
...@@ -79,10 +77,10 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -79,10 +77,10 @@ public class SettlementServiceImpl implements SettlementService {
79 SingleClientCustomerOrderRpcResponse::getMenuId).distinct() 77 SingleClientCustomerOrderRpcResponse::getMenuId).distinct()
80 .collect(Collectors.toList()); 78 .collect(Collectors.toList());
81 final var menuList = menuServiceRpcClient 79 final var menuList = menuServiceRpcClient
82 - .getMenusByIds(operatorLoginInfo.getEnterpriseId(), menuIds) 80 + .getMenusByIds(enterpriseId, menuIds)
83 .getResponsesList(); 81 .getResponsesList();
84 final var menuDetailList = menuServiceRpcClient.queryMenuDetailsByMenuIds( 82 final var menuDetailList = menuServiceRpcClient.queryMenuDetailsByMenuIds(
85 - operatorLoginInfo.getEnterpriseId(), menuIds).getResponsesList(); 83 + enterpriseId, menuIds).getResponsesList();
86 84
87 Map<String, Map<String, List<SettlementMenuSkuDto>>> classifyOrders = new HashMap<>(); 85 Map<String, Map<String, List<SettlementMenuSkuDto>>> classifyOrders = new HashMap<>();
88 86
...@@ -178,7 +176,7 @@ public class SettlementServiceImpl implements SettlementService { ...@@ -178,7 +176,7 @@ public class SettlementServiceImpl implements SettlementService {
178 176
179 } 177 }
180 } 178 }
181 - final var client = inventoryServiceRpcClient.getClientById(operatorLoginInfo.getEnterpriseId(), 179 + final var client = inventoryServiceRpcClient.getClientById(enterpriseId,
182 settlementRequest.getClientId()).getClient(); 180 settlementRequest.getClientId()).getClient();
183 final var settlementDataDto = SettlementDataDto.builder() 181 final var settlementDataDto = SettlementDataDto.builder()
184 .classifyOrders(classifyOrders) 182 .classifyOrders(classifyOrders)
......