jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
wangyingyang
c1ff6372 1 parent 226b1f16

add settlement

Inline Side-by-side
Showing 23 changed files with 563 additions and 24 deletions
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
......@@ -5,6 +5,7 @@ import cn.dev33.satoken.stp.SaTokenInfo;
import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.ClientCustomerDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.HospitalRecordDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.TodayOrderDto;
import com.infoloop.tianting.model.dto.PermissionDTO.LoginDto;
import com.infoloop.tianting.model.dto.WxUserDto.WxUserOpenIdDto;
import com.infoloop.tianting.model.dto.WxUserDto.WxUserPhoneResponseDto;
......@@ -12,6 +13,7 @@ import com.infoloop.tianting.service.ClientCustomerService;
import com.infoloop.tianting.service.LoginService;
import com.infoloop.tianting.service.WxMiniProgramService;
import com.infoloop.tianting.service.client.ClientCustomerServiceHttpClient;
import io.lettuce.core.dynamic.annotation.Param;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
......@@ -23,6 +25,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
......@@ -61,14 +64,17 @@ public class ClientCustomerController {
}
@ApiOperation(value = "获取今日在住")
@GetMapping("/clientCustomers/current")
@GetMapping("/clientCustomers/today/statistic")
@ResponseStatus(HttpStatus.OK)
public List<HospitalRecordDto> get(@PathVariable Integer enterpriseId,
@PathVariable Integer customerId) {
return clientCustomerService.getClientCustomerHospitalRecordsByCustomerId(
enterpriseId, customerId);
public TodayOrderDto getClientCustomerTodayOrderStatistic(@RequestParam String customerToken) {
return clientCustomerService.getTodayOrderStatistic(customerToken, false);
}
@ApiOperation(value = "获取his今日在住")
@GetMapping("/hisClientCustomers/today/statistic")
@ResponseStatus(HttpStatus.OK)
public TodayOrderDto getHisClientCustomerTodayOrderStatistic(@RequestParam String customerToken) {
return clientCustomerService.getTodayOrderStatistic(customerToken, true);
}
}
......
package com.infoloop.tianting.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public enum SettlementDimensionEnum {
BY_SKU(1, "菜品"),
BY_MEAL(2, "餐别"),
;
/**
* 汇总结账维度的值
*/
private final Integer value;
/**
* 汇总结账维度的名字
*/
private final String name;
}
......@@ -2,9 +2,13 @@ package com.infoloop.tianting.model.dto;
import com.infoloop.tianting.clientcustomerservice.ClientCustomerHospitalRecordHospitalStatusEnum;
import com.infoloop.tianting.clientcustomerservice.ClientCustomerSexEnum;
import com.infoloop.tianting.model.dto.MenuDbDTO.MenuDto;
import io.swagger.annotations.ApiModel;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@ApiModel(description = "ClientCustomerDTO")
......@@ -68,8 +72,10 @@ public class ClientCustomerDbDTO {
@Data
@Builder
@ApiModel(description = "CurrentClientCustomerDto")
@AllArgsConstructor
@NoArgsConstructor
public static class CurrentClientCustomerDto {
private Integer id;
private String id;
private Integer clientId;
private String clientName;
private String stallName;
......@@ -77,20 +83,34 @@ public class ClientCustomerDbDTO {
private String sex;
private Integer age;
private Integer stallId;
private String roomNo;
}
@Data
@Builder
@ApiModel(description = "CurrentHisClientCustomerDto")
public static class CurrentHisClientCustomerDto {
@ApiModel(description = "CurrentClientCustomerListDto")
@AllArgsConstructor
@NoArgsConstructor
public static class CurrentClientCustomerListDto {
private List<CurrentClientCustomerDto> rows;
}
@Data
@Builder
@ApiModel(description = "TodayOrderDto")
public static class NotOrderCustomerDto {
private Integer id;
private Integer clientId;
private String clientName;
private String stallName;
private String roomNo;
private String name;
private String sex;
private Integer age;
private Integer stallId;
private List<MenuDto> menuList;
}
@Data
@Builder
@ApiModel(description = "TodayOrderDto")
public static class TodayOrderDto {
private Integer totalCurrentCustomerCount;
private List<NotOrderCustomerDto> notOrderCustomers;
}
......
......@@ -9,12 +9,14 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import javax.validation.Valid;
import jdk.jfr.StackTrace;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Builder.Default;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.ToString;
......@@ -63,8 +65,30 @@ public class OrderDbDTO {
@ApiModel(description = "查询订单Dto")
public static class QueryOrderByConditionDto {
private Integer enterpriseId;
private Boolean shouldFilterOpenId;
private String openId;
@Builder.Default
private Boolean shouldFilterOpenId = false;
@Builder.Default
private String openId = "";
@Builder.Default
private Boolean shouldFilterCustomerIds = false;
@Builder.Default
private List<Integer> customerIds = new ArrayList<>();
@Builder.Default
private Boolean shouldFilterMealTimeStart = false;
@Builder.Default
private LocalDateTime mealTimeStart = LocalDateTime.now();
@Builder.Default
private Boolean shouldFilterMealTimeEnd = false;
@Builder.Default
private LocalDateTime mealTimeEnd = LocalDateTime.now();
@Builder.Default
private Boolean shouldFilterCreatedAtTimeStart = false;
@Builder.Default
private LocalDateTime createdAtTimeStart = LocalDateTime.now();
@Builder.Default
private Boolean shouldFilterCreatedAtTimeEnd = false;
@Builder.Default
private LocalDateTime createdAtTimeEnd = LocalDateTime.now();
}
@Data
......
package com.infoloop.tianting.model.dto;
import com.infoloop.tianting.enums.SettlementDimensionEnum;
import io.swagger.annotations.ApiModel;
import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Data;
@Data
@ApiModel(description = "统计DTO")
public class StatisticDTO {
public class SettlementDTO {
@Data
@Builder
@ApiModel(description = "SettlementRequestDto")
public static class SettlementRequestDto {
private Integer id;
private SettlementDimensionEnum dimension;
private String name;
private LocalDateTime timeStart;
private LocalDateTime timeEnd;
}
@Data
@Builder
@ApiModel(description = "SettlementRequestDto")
public static class SettlementMenuSkuDto {
private String showName;
private Integer count;
private Integer price;
private Integer totalPrice;
}
}
\ No newline at end of file
......
......@@ -2,6 +2,7 @@ package com.infoloop.tianting.service;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.ClientCustomerDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.HospitalRecordDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.TodayOrderDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchCreateCustomerLabelRefDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchCreateCustomerLabelRefResponseDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchDeleteCustomerLabelRefRequestDto;
......@@ -27,4 +28,6 @@ public interface ClientCustomerService {
BatchDeleteCustomerLabelRefResponseDto deleteClientCustomerLabelRefsByIds(
BatchDeleteCustomerLabelRefRequestDto deleteRequestDto);
TodayOrderDto getTodayOrderStatistic(String token, boolean isHis);
}
......
package com.infoloop.tianting.service;
import com.infoloop.tianting.model.dto.SettlementDTO.SettlementRequestDto;
import java.io.ByteArrayOutputStream;
public interface SettlementService {
ByteArrayOutputStream generateOrderSettlementExcel(SettlementRequestDto settlementRequest);
}
......@@ -3,6 +3,7 @@ package com.infoloop.tianting.service.client;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.CurrentClientCustomerDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.CurrentClientCustomerListDto;
import com.infoloop.tianting.model.dto.WxUserDto.WxUserOpenIdDto;
import java.util.ArrayList;
import java.util.List;
......@@ -18,12 +19,19 @@ import org.springframework.stereotype.Service;
public class ClientCustomerServiceHttpClient {
private final OkHttpClient client = new OkHttpClient();
public List<CurrentClientCustomerDto> getCurrentClientCustomer() {
public List<CurrentClientCustomerDto> getCurrentClientCustomer(String token, boolean isHis) {
ObjectMapper objectMapper = new ObjectMapper();
try {
String url = "http://47.101.193.136:3031/clientcustomers/current/query";
String url = "";
if (isHis) {
url = "https://nutri2.infoscm.cn/v3/hisClientcustomers/current/query";
} else {
url = "https://nutri2.infoscm.cn/v3/clientcustomers/current/query";
}
Request request = new Request.Builder()
.url(url)
.addHeader("Authorization", token)
.build();
Response response = client.newCall(request).execute();
......@@ -31,8 +39,7 @@ public class ClientCustomerServiceHttpClient {
String jsonData = response.body().string();
System.out.println(jsonData);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
// return objectMapper.readValue(jsonData, WxUserOpenIdDto.class);
return new ArrayList<>();
return objectMapper.readValue(jsonData, CurrentClientCustomerListDto.class).getRows();
} catch (Exception e) {
System.out.println("error"+e.getMessage());
throw new IllegalArgumentException("获取用户openid失败");
......
......@@ -16,6 +16,8 @@ import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByMobileRpcR
import com.infoloop.tianting.clientcustomerservice.GetClientCustomerByMobileRpcResponse;
import com.infoloop.tianting.clientcustomerservice.GetClientCustomerHospitalRecordByCustomerIdRpcRequest;
import com.infoloop.tianting.clientcustomerservice.GetClientCustomerHospitalRecordByCustomerIdRpcResponse;
import com.infoloop.tianting.clientcustomerservice.GetClientCustomersByHISCustomerIdsRpcRequest;
import com.infoloop.tianting.clientcustomerservice.GetClientCustomersByHISCustomerIdsRpcResponse;
import com.infoloop.tianting.clientcustomerservice.GetClientCustomersByIdsRpcRequest;
import com.infoloop.tianting.clientcustomerservice.GetClientCustomersByIdsRpcResponse;
import com.infoloop.tianting.clientcustomerservice.QueryClientCustomerLabelRefsByConditionRpcRequest;
......@@ -45,6 +47,15 @@ public class ClientCustomerServiceRpcClient {
return clientCustomerServiceRpcBlockingStub.getClientCustomerByHISCustomerId(request);
}
public GetClientCustomersByHISCustomerIdsRpcResponse getClientCustomersByHISCustomerIds(
List<String> hisCustomerIds
) {
final var request = GetClientCustomersByHISCustomerIdsRpcRequest.newBuilder()
.addAllHISCustomerIds(hisCustomerIds)
.build();
return clientCustomerServiceRpcBlockingStub.getClientCustomersByHISCustomerIds(request);
}
public GetClientCustomerByContactNoRpcResponse getClientCustomerByContactNo(String contractNo) {
final var request = GetClientCustomerByContactNoRpcRequest.newBuilder()
.setContractNo(contractNo).build();
......
......@@ -5,12 +5,16 @@ import com.infoloop.tianting.menuservice.BatchCreateClientCustomerMenuRefsRpcRes
import com.infoloop.tianting.menuservice.ClientCustomerMenuRefCreation;
import com.infoloop.tianting.menuservice.GetClientCustomerMenuRefsByCustomerIdRpcRequest;
import com.infoloop.tianting.menuservice.GetClientCustomerMenuRefsByCustomerIdRpcResponse;
import com.infoloop.tianting.menuservice.GetClientCustomerMenuRefsByCustomerIdsRpcRequest;
import com.infoloop.tianting.menuservice.GetClientCustomerMenuRefsByCustomerIdsRpcResponse;
import com.infoloop.tianting.menuservice.GetMenuByIdRpcRequest;
import com.infoloop.tianting.menuservice.GetMenuByIdRpcResponse;
import com.infoloop.tianting.menuservice.GetMenuDetailByIdRpcRequest;
import com.infoloop.tianting.menuservice.GetMenuDetailByIdRpcResponse;
import com.infoloop.tianting.menuservice.GetMenuDetailsByMenuIdsRpcRequest;
import com.infoloop.tianting.menuservice.GetMenuDetailsByMenuIdsRpcResponse;
import com.infoloop.tianting.menuservice.GetMenusByIdsRpcRequest;
import com.infoloop.tianting.menuservice.GetMenusByIdsRpcResponse;
import com.infoloop.tianting.menuservice.GetMicroPublishedMenusByStallIdsRpcRequest;
import com.infoloop.tianting.menuservice.GetMicroPublishedMenusByStallIdsRpcResponse;
import com.infoloop.tianting.menuservice.GetPublishedMenusByStallIdsRpcRequest;
......@@ -60,6 +64,15 @@ public class MenuServiceRpcClient {
return menuServiceRpcBlockingStub.getMenuById(request);
}
public GetMenusByIdsRpcResponse getMenusByIds(Integer enterpriseId, List<Integer> ids) {
final var request = GetMenusByIdsRpcRequest.newBuilder()
.setEnterpriseId(enterpriseId)
.addAllIds(ids)
.setIncludeDeleted(false)
.build();
return menuServiceRpcBlockingStub.getMenusByIds(request);
}
public GetMenuDetailByIdRpcResponse getMenuDetailById(Integer enterpriseId, Integer id) {
final var request = GetMenuDetailByIdRpcRequest.newBuilder()
.setEnterpriseId(enterpriseId)
......@@ -79,6 +92,16 @@ public class MenuServiceRpcClient {
return menuServiceRpcBlockingStub.getMenuDetailsByMenuIds(request);
}
public GetMenuDetailsByMenuIdsRpcResponse queryMenuDetailsByMenuIds(
Integer enterpriseId, List<Integer> menuIds) {
final var request = GetMenuDetailsByMenuIdsRpcRequest.newBuilder()
.setEnterpriseId(enterpriseId)
.addAllMenuIds(menuIds)
.setIncludeDeleted(false)
.build();
return menuServiceRpcBlockingStub.getMenuDetailsByMenuIds(request);
}
public GetClientCustomerMenuRefsByCustomerIdRpcResponse getClientCustomerMenuRefsByCustomerId(
Integer enterpriseId, Integer customerId
) {
......@@ -91,6 +114,18 @@ public class MenuServiceRpcClient {
}
public GetClientCustomerMenuRefsByCustomerIdsRpcResponse getClientCustomerMenuRefsByCustomerIds(
Integer enterpriseId, List<Integer> customerIds
) {
final var request = GetClientCustomerMenuRefsByCustomerIdsRpcRequest.newBuilder()
.setEnterpriseId(enterpriseId)
.addAllCustomerIds(customerIds)
.build();
return menuServiceRpcBlockingStub.getClientCustomerMenuRefsByCustomerIds(request);
}
public BatchCreateClientCustomerMenuRefsRpcResponse batchCreateClientCustomerMenuRefs(
BatchCreateMenuRefsDto batchCreateMenuRefsDto) {
final var creations = batchCreateMenuRefsDto.getCreations().stream().map(mr->
......
......@@ -64,6 +64,16 @@ public class OrderServiceRpcClient {
.setEnterpriseId(queryOrderDto.getEnterpriseId())
.setShouldFilterOpenIds(queryOrderDto.getShouldFilterOpenId())
.addAllOpenIds(List.of(queryOrderDto.getOpenId()))
.setShouldFilterCustomerIds(queryOrderDto.getShouldFilterCustomerIds())
.addAllCustomerIds(queryOrderDto.getCustomerIds())
.setShouldFilterMealTimeStart(queryOrderDto.getShouldFilterMealTimeStart())
.setMealTimeStart(queryOrderDto.getMealTimeStart().toInstant(ZoneOffset.UTC).toEpochMilli())
.setShouldFilterMealTimeEnd(queryOrderDto.getShouldFilterMealTimeEnd())
.setMealTimeEnd(queryOrderDto.getMealTimeEnd().toInstant(ZoneOffset.UTC).toEpochMilli())
.setShouldFilterCreatedAtStart(queryOrderDto.getShouldFilterCreatedAtTimeStart())
.setCreatedAtStart(queryOrderDto.getCreatedAtTimeStart().toInstant(ZoneOffset.UTC).toEpochMilli())
.setShouldFilterCreatedAtStart(queryOrderDto.getShouldFilterCreatedAtTimeEnd())
.setCreatedAtEnd(queryOrderDto.getCreatedAtTimeEnd().toInstant(ZoneOffset.UTC).toEpochMilli())
.build();
return orderServiceRpcBlockingStub.queryClientCustomerOrdersByCondition(request).getResponsesList();
}
......
package com.infoloop.tianting.service.impl;
import com.fasterxml.jackson.annotation.JacksonInject.Value;
import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse;
import com.infoloop.tianting.clientcustomerservice.SingleClientCustomerRpcResponse;
import com.infoloop.tianting.context.LoginContextHolder;
import com.infoloop.tianting.menuservice.SingleClientCustomerMenuRefRpcResponse;
import com.infoloop.tianting.menuservice.SingleMenuRpcResponse;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.ClientCustomerDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.CurrentClientCustomerDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.HospitalRecordDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.NotOrderCustomerDto;
import com.infoloop.tianting.model.dto.ClientCustomerDbDTO.TodayOrderDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchCreateCustomerLabelRefDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchCreateCustomerLabelRefResponseDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchDeleteCustomerLabelRefRequestDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.BatchDeleteCustomerLabelRefResponseDto;
import com.infoloop.tianting.model.dto.ClientLabelDTO.CustomerLabelRefDetailDto;
import com.infoloop.tianting.model.dto.MenuDbDTO.DishRuleJson;
import com.infoloop.tianting.model.dto.MenuDbDTO.MenuDto;
import com.infoloop.tianting.model.dto.MenuDbDTO.OrderRuleJson;
import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
import com.infoloop.tianting.service.ClientCustomerService;
import com.infoloop.tianting.service.client.ClientCustomerServiceHttpClient;
import com.infoloop.tianting.service.client.ClientCustomerServiceRpcClient;
import com.infoloop.tianting.service.client.MenuServiceRpcClient;
import com.infoloop.tianting.service.client.OrderServiceRpcClient;
import com.infoloop.tianting.utils.DateUtil;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import javax.mail.search.SearchTerm;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -24,6 +47,9 @@ import java.util.stream.Collectors;
public class ClientCustomerServiceImpl implements ClientCustomerService {
private final ClientCustomerServiceRpcClient clientCustomerServiceRpcClient;
private final ClientCustomerServiceHttpClient clientCustomerServiceHttpClient;
private final OrderServiceRpcClient orderServiceRpcClient;
private final MenuServiceRpcClient menuServiceRpcClient;
@Override
public ClientCustomerDto getClientCustomerByHISCustomerId(String hisCustomerId) {
......@@ -154,4 +180,217 @@ public class ClientCustomerServiceImpl implements ClientCustomerService {
return BatchDeleteCustomerLabelRefResponseDto.builder().isDeleted(response.getIsDeleted()).build();
}
// @Override
// public TodayOrderDto getTodayOrderStatistic(String token) {
// final var currentCustomers = clientCustomerServiceHttpClient.getCurrentClientCustomer(token, false);
// final var customerIds = currentCustomers.stream().map(CurrentClientCustomerDto::getId).map(id -> {try{
// return Integer.valueOf(id);
// } catch (NumberFormatException e) {
// return null;
// }
// }).filter(Objects::nonNull).distinct().collect(Collectors.toList());
// final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
// LocalDate today = LocalDate.now();
// LocalDateTime todayZero = today.atStartOfDay();
// LocalDate tomorrow = today.plusDays(1);
// LocalDateTime tomorrowZero = tomorrow.atStartOfDay();
// final var queryOrderDto = QueryOrderByConditionDto.builder()
// .enterpriseId(operatorLoginInfo.getEnterpriseId())
// .shouldFilterCustomerIds(true)
// .customerIds(customerIds)
// .shouldFilterMealTimeStart(true)
// .mealTimeStart(todayZero)
// .shouldFilterMealTimeEnd(true)
// .mealTimeEnd(tomorrowZero)
// .build();
// final var orderedResponseList = orderServiceRpcClient.getOrdersByCondition(queryOrderDto);
// List<Integer> uniqueOrderedCustomerIds = orderedResponseList.stream().map(
// SingleClientCustomerOrderRpcResponse::getCustomerId).distinct()
// .collect(Collectors.toList());
// List<Integer> notOrderedCustomerIds = customerIds.stream().filter(id -> !uniqueOrderedCustomerIds.contains(id)).collect(
// Collectors.toList());
// // 根据customerIds 获取到menuRef列表
// final var menuRefs = menuServiceRpcClient.getClientCustomerMenuRefsByCustomerIds(
// operatorLoginInfo.getEnterpriseId(), notOrderedCustomerIds).getResponsesList();
// final var menuIds = menuRefs.stream().map(SingleClientCustomerMenuRefRpcResponse::getMenuId)
// .collect(Collectors.toList());
// final var menus = menuServiceRpcClient.getMenusByIds(operatorLoginInfo.getEnterpriseId(),
// menuIds).getResponsesList();
//
// List<NotOrderCustomerDto> resNotOrderCustomers = new ArrayList<>();
// // 在customers里找到未下单的用户
// final var notOrderCustomers = currentCustomers.stream().filter(c ->
// notOrderedCustomerIds.contains(Integer.valueOf(c.getId()))).collect(Collectors.toList());
//
// for(CurrentClientCustomerDto notOrderCustomer: notOrderCustomers) {
//
// // 在ref里找到这个用户的menu ids
// final var notOrderCustomerId = Integer.valueOf(notOrderCustomer.getId());
// final var curMenuIds = menuRefs.stream().filter(r -> r.getCustomerId() == notOrderCustomerId)
// .map(SingleClientCustomerMenuRefRpcResponse::getMenuId).collect(Collectors.toList());
// // 根据menu ids找到 menus
// final var curMenus = menus.stream().filter(m -> curMenuIds.contains(m.getId()))
// .collect(Collectors.toList());
//
// final var curMenuDtos = curMenus.stream().map(menu ->
// MenuDto.builder()
// .id(menu.getId())
// .code(menu.getCode())
// .enterpriseId(menu.getEnterpriseId())
// .name(menu.getName())
// .status(menu.getStatusValue())
// .customerScope(menu.getCustomerScope())
// .nutritionPromotion(menu.getNutritionPromotion())
// .nutritionalStatistics(menu.getNutritionalStatistics())
// .dishRuleJson(DishRuleJson.builder()
// .days(menu.getDishRuleJson().getDays())
// .dishType(menu.getDishRuleJson().getDishType())
// .mealIds(menu.getDishRuleJson().getMealIdsList())
// .build())
// .orderRuleJson(OrderRuleJson.builder()
// .allowMicroPlaceOrder(menu.getOrderRuleJson().getAllowMicroPlaceOrder())
// .closeTimeType(menu.getOrderRuleJson().getCloseTimeType())
// .dishSelectRule(menu.getOrderRuleJson().getDishSelectRule())
// .earlyDays(menu.getOrderRuleJson().getEarlyDays())
// .modeOfPayment(menu.getOrderRuleJson().getModeOfPayment())
// .placeOrderCount(menu.getOrderRuleJson().getPlaceOrderCount())
// .startTime(menu.getOrderRuleJson().getStartTime())
// .endTime(menu.getOrderRuleJson().getEndTime())
// .deadline(menu.getOrderRuleJson().getDeadline())
// .build())
// .createdBy(menu.getCreatedBy())
// .creationSource(menu.getCreationSource())
// .createdAt(DateUtil.formatDate(menu.getCreatedAt()))
// .updatedBy(menu.getUpdatedBy())
// .updateSource(menu.getUpdateSource())
// .updatedAt(DateUtil.formatDate(menu.getUpdatedAt()))
// .publishAt(DateUtil.formatDate(menu.getPublishAt()))
// .build()).collect(Collectors.toList());
// final var resNotOrderCustomer = NotOrderCustomerDto.builder()
// .id(notOrderCustomerId)
// .name(notOrderCustomer.getName())
// .roomNo(notOrderCustomer.getRoomNo())
// .menuList(curMenuDtos)
// .build();
// resNotOrderCustomers.add(resNotOrderCustomer);
// }
//
// return TodayOrderDto.builder()
// .totalCurrentCustomerCount(currentCustomers.size())
// .notOrderCustomers(resNotOrderCustomers)
// .build();
// }
@Override
public TodayOrderDto getTodayOrderStatistic(String token, boolean isHis) {
List<CurrentClientCustomerDto> currentCustomers = new ArrayList<>();
List<Integer> customerIds = new ArrayList<>();
if (isHis){
currentCustomers = clientCustomerServiceHttpClient.getCurrentClientCustomer(token, true);
final var hisCustomerIds = currentCustomers.stream().map(CurrentClientCustomerDto::getId).distinct()
.collect(Collectors.toList());
final var currentClientCustomers = clientCustomerServiceRpcClient.getClientCustomersByHISCustomerIds(hisCustomerIds).getResponsesList();
customerIds = currentClientCustomers.stream().map(SingleClientCustomerRpcResponse::getId).distinct().collect(Collectors.toList());
} else {
currentCustomers = clientCustomerServiceHttpClient.getCurrentClientCustomer(token, false);
customerIds = currentCustomers.stream().map(CurrentClientCustomerDto::getId).map(id -> {try{
return Integer.valueOf(id);
} catch (NumberFormatException e) {
return null;
}
}).filter(Objects::nonNull).distinct().collect(Collectors.toList());
}
final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
LocalDate today = LocalDate.now();
LocalDateTime todayZero = today.atStartOfDay();
LocalDate tomorrow = today.plusDays(1);
LocalDateTime tomorrowZero = tomorrow.atStartOfDay();
final var queryOrderDto = QueryOrderByConditionDto.builder()
.enterpriseId(operatorLoginInfo.getEnterpriseId())
.shouldFilterCustomerIds(true)
.customerIds(customerIds)
.shouldFilterMealTimeStart(true)
.mealTimeStart(todayZero)
.shouldFilterMealTimeEnd(true)
.mealTimeEnd(tomorrowZero)
.build();
final var orderedResponseList = orderServiceRpcClient.getOrdersByCondition(queryOrderDto);
List<Integer> uniqueOrderedCustomerIds = orderedResponseList.stream().map(
SingleClientCustomerOrderRpcResponse::getCustomerId).distinct()
.collect(Collectors.toList());
List<Integer> notOrderedCustomerIds = customerIds.stream().filter(id -> !uniqueOrderedCustomerIds.contains(id)).collect(
Collectors.toList());
// 根据customerIds 获取到menuRef列表
final var menuRefs = menuServiceRpcClient.getClientCustomerMenuRefsByCustomerIds(
operatorLoginInfo.getEnterpriseId(), notOrderedCustomerIds).getResponsesList();
final var menuIds = menuRefs.stream().map(SingleClientCustomerMenuRefRpcResponse::getMenuId)
.collect(Collectors.toList());
final var menus = menuServiceRpcClient.getMenusByIds(operatorLoginInfo.getEnterpriseId(),
menuIds).getResponsesList();
List<NotOrderCustomerDto> resNotOrderCustomers = new ArrayList<>();
// 在customers里找到未下单的用户
final var notOrderCustomers = currentCustomers.stream().filter(c ->
notOrderedCustomerIds.contains(Integer.valueOf(c.getId()))).collect(Collectors.toList());
for(CurrentClientCustomerDto notOrderCustomer: notOrderCustomers) {
// 在ref里找到这个用户的menu ids
final var notOrderCustomerId = Integer.valueOf(notOrderCustomer.getId());
final var curMenuIds = menuRefs.stream().filter(r -> r.getCustomerId() == notOrderCustomerId)
.map(SingleClientCustomerMenuRefRpcResponse::getMenuId).collect(Collectors.toList());
// 根据menu ids找到 menus
final var curMenus = menus.stream().filter(m -> curMenuIds.contains(m.getId()))
.collect(Collectors.toList());
final var curMenuDtos = curMenus.stream().map(menu ->
MenuDto.builder()
.id(menu.getId())
.code(menu.getCode())
.enterpriseId(menu.getEnterpriseId())
.name(menu.getName())
.status(menu.getStatusValue())
.customerScope(menu.getCustomerScope())
.nutritionPromotion(menu.getNutritionPromotion())
.nutritionalStatistics(menu.getNutritionalStatistics())
.dishRuleJson(DishRuleJson.builder()
.days(menu.getDishRuleJson().getDays())
.dishType(menu.getDishRuleJson().getDishType())
.mealIds(menu.getDishRuleJson().getMealIdsList())
.build())
.orderRuleJson(OrderRuleJson.builder()
.allowMicroPlaceOrder(menu.getOrderRuleJson().getAllowMicroPlaceOrder())
.closeTimeType(menu.getOrderRuleJson().getCloseTimeType())
.dishSelectRule(menu.getOrderRuleJson().getDishSelectRule())
.earlyDays(menu.getOrderRuleJson().getEarlyDays())
.modeOfPayment(menu.getOrderRuleJson().getModeOfPayment())
.placeOrderCount(menu.getOrderRuleJson().getPlaceOrderCount())
.startTime(menu.getOrderRuleJson().getStartTime())
.endTime(menu.getOrderRuleJson().getEndTime())
.deadline(menu.getOrderRuleJson().getDeadline())
.build())
.createdBy(menu.getCreatedBy())
.creationSource(menu.getCreationSource())
.createdAt(DateUtil.formatDate(menu.getCreatedAt()))
.updatedBy(menu.getUpdatedBy())
.updateSource(menu.getUpdateSource())
.updatedAt(DateUtil.formatDate(menu.getUpdatedAt()))
.publishAt(DateUtil.formatDate(menu.getPublishAt()))
.build()).collect(Collectors.toList());
final var resNotOrderCustomer = NotOrderCustomerDto.builder()
.id(notOrderCustomerId)
.name(notOrderCustomer.getName())
.roomNo(notOrderCustomer.getRoomNo())
.menuList(curMenuDtos)
.build();
resNotOrderCustomers.add(resNotOrderCustomer);
}
return TodayOrderDto.builder()
.totalCurrentCustomerCount(currentCustomers.size())
.notOrderCustomers(resNotOrderCustomers)
.build();
}
}
......
package com.infoloop.tianting.service.impl;
import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderDetailRpcResponse;
import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse;
import com.infoloop.tianting.context.LoginContextHolder;
import com.infoloop.tianting.menuservice.SingleMenuDetailRpcResponse;
import com.infoloop.tianting.menuservice.SingleMenuRpcResponse;
import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
import com.infoloop.tianting.model.dto.SettlementDTO.SettlementMenuSkuDto;
import com.infoloop.tianting.model.dto.SettlementDTO.SettlementRequestDto;
import com.infoloop.tianting.service.OrderService;
import com.infoloop.tianting.service.SettlementService;
import com.infoloop.tianting.service.client.MenuServiceRpcClient;
import com.infoloop.tianting.service.client.OrderServiceRpcClient;
import com.infoloop.tianting.utils.DateUtil;
import java.io.ByteArrayOutputStream;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class SettlementServiceImpl implements SettlementService {
private final OrderServiceRpcClient orderServiceRpcClient;
private final MenuServiceRpcClient menuServiceRpcClient;
@Override
public ByteArrayOutputStream generateOrderSettlementExcel(SettlementRequestDto settlementRequest) {
final var operatorLoginInfo = LoginContextHolder.getLoginInfo();
final var queryOrderDto = QueryOrderByConditionDto.builder()
.enterpriseId(operatorLoginInfo.getEnterpriseId())
.shouldFilterCreatedAtTimeStart(true)
.createdAtTimeStart(settlementRequest.getTimeStart())
.shouldFilterCreatedAtTimeEnd(true)
.createdAtTimeEnd(settlementRequest.getTimeEnd())
.build();
final var orderList = orderServiceRpcClient.getOrdersByCondition(queryOrderDto);
List<Integer> orderIds = orderList.stream().map(
SingleClientCustomerOrderRpcResponse::getId).distinct()
.collect(Collectors.toList());
final var orderDetailList = orderServiceRpcClient.getOrderDetailsByOrderIds(orderIds);
List<Integer> menuIds = orderList.stream().map(
SingleClientCustomerOrderRpcResponse::getMenuId).distinct()
.collect(Collectors.toList());
final var menuList = menuServiceRpcClient.getMenusByIds(operatorLoginInfo.getEnterpriseId(), menuIds);
final var menuDetailList = menuServiceRpcClient.queryMenuDetailsByMenuIds(
operatorLoginInfo.getEnterpriseId(), menuIds).getResponsesList();
Map<String, Map<Integer, List<SettlementMenuSkuDto>>> classifyOrders = new HashMap<>();
//找出所有需要的日期
final var dates = orderList.stream()
.map(o -> DateUtil.formatDate(o.getCreatedAt(), DateUtil.YYYY_MM_DD))
.collect(Collectors.toList());
for(String date: dates) {
if (!classifyOrders.containsKey(date)) {
classifyOrders.put(date, new HashMap<>());
}
final var menusMap = classifyOrders.get(date);
// 找出当天所有的订单
final var curOrderList = orderList.stream()
.filter(o -> DateUtil.formatDate(o.getCreatedAt(), DateUtil.YYYY_MM_DD).equals(date))
.collect(Collectors.toList());
final var curOrderIds = curOrderList.stream()
.map(SingleClientCustomerOrderRpcResponse::getId)
.collect(Collectors.toList());
// 找出当天已点的所有餐单
final var curMenuIds = curOrderList.stream()
.map(SingleClientCustomerOrderRpcResponse::getMenuId)
.collect(Collectors.toList());
for (Integer curMenuId: curMenuIds) {
if (!menusMap.containsKey(curMenuId)) {
menusMap.put(curMenuId, new ArrayList<>());
}
final var menuSkuList = new ArrayList<SettlementMenuSkuDto>();
// 找出当天餐单所有的菜品
final var curMenuDetails = menuDetailList.stream()
.filter(md -> md.getMenuId() == curMenuId)
.collect(Collectors.toList());
final var curMenuDetailIds = curMenuDetails.stream()
.map(SingleMenuDetailRpcResponse::getId)
.collect(Collectors.toList());
//找出当天所有已点的菜品明细
final var curOrderDetails = orderDetailList.stream()
.filter(d -> curOrderIds.contains(d.getOrderId()))
.collect(Collectors.toList());
for (SingleMenuDetailRpcResponse m: curMenuDetails) {
// 找出该餐单下该sku所点菜品的明细
final var curSkuOrderDetails = curOrderDetails.stream()
.filter(rd-> rd.getMenuDetailId() == m.getId())
.collect(Collectors.toList());
final var countList = curSkuOrderDetails.stream()
.map(SingleClientCustomerOrderDetailRpcResponse::getCount)
.collect(Collectors.toList());
int countTotal = countList.stream().mapToInt(Integer::intValue).sum();
final var settlementMenuSku = SettlementMenuSkuDto.builder()
.count(countTotal)
.showName(m.getShowName())
.price(m.getPrice())
.totalPrice(m.getPrice() * countTotal)
.build();
menuSkuList.add(settlementMenuSku);
}
menusMap.get(curMenuId).addAll(menuSkuList);
}
}
}
}
......@@ -46,6 +46,7 @@ service MenuServiceRpc {
//餐单客户关联
rpc GetClientCustomerMenuRefsByCustomerId (GetClientCustomerMenuRefsByCustomerIdRpcRequest) returns (GetClientCustomerMenuRefsByCustomerIdRpcResponse) {}
rpc GetClientCustomerMenuRefsByCustomerIds (GetClientCustomerMenuRefsByCustomerIdsRpcRequest) returns (GetClientCustomerMenuRefsByCustomerIdsRpcResponse) {}
rpc BatchCreateClientCustomerMenuRefs (BatchCreateClientCustomerMenuRefsRpcRequest) returns (BatchCreateClientCustomerMenuRefsRpcResponse) {}
rpc UpdateClientCustomerMenuRefTop (UpdateClientCustomerMenuRefTopRpcRequest) returns (UpdateClientCustomerMenuRefTopRpcResponse) {}
rpc DeleteClientCustomerMenuRefsByIds (DeleteClientCustomerMenuRefsByIdsRpcRequest) returns (DeleteClientCustomerMenuRefsRpcResponse) {}
......@@ -554,6 +555,15 @@ message GetClientCustomerMenuRefsByCustomerIdRpcResponse {
repeated SingleClientCustomerMenuRefRpcResponse responses = 1;
}
message GetClientCustomerMenuRefsByCustomerIdsRpcRequest {
repeated int32 customerIds = 1;
int32 enterpriseId = 2;
}
message GetClientCustomerMenuRefsByCustomerIdsRpcResponse {
repeated SingleClientCustomerMenuRefRpcResponse responses = 1;
}
message ClientCustomerMenuRefCreation{
int32 menuId = 1;
int32 customerId = 2;
......