jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
083141b5 1 parent e6dd2b6e

refactor(exception): 优化错误代码和消息

Inline Side-by-side
Showing 4 changed files with 9 additions and 8 deletions
...@@ -30,11 +30,11 @@ public enum ErrorCodeEnum implements BaseEnum { ...@@ -30,11 +30,11 @@ public enum ErrorCodeEnum implements BaseEnum {
30 30
31 QUERY_CLIENT_CUSTOMER_ERROR(406000006, "获取当日在住客户失败"), 31 QUERY_CLIENT_CUSTOMER_ERROR(406000006, "获取当日在住客户失败"),
32 32
33 - SKUS_SOLD_OUT_TODAY(406000007, "下单菜品\n{0}\n今日已售罄"), 33 + SKUS_SOLD_OUT_TODAY(406000007, "下单菜品： {0} 今日已售罄"),
34 34
35 - SKUS_STOCK_NO_ENOUGH_TODAY(406000007, "下单菜品\n{0}\n库存不足"), 35 + SKUS_STOCK_NO_ENOUGH_TODAY(406000008, "下单菜品： {0} 库存不足"),
36 36
37 - ORDER_CANCEL(406000008, "订单已自动取消") 37 + ORDER_CANCEL(406000009, "订单已自动取消")
38 ; 38 ;
39 private final int code; 39 private final int code;
40 40
......
...@@ -27,7 +27,7 @@ import java.util.stream.Collectors; ...@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
27 public class WebSocketServer extends TextWebSocketHandler { 27 public class WebSocketServer extends TextWebSocketHandler {
28 28
29 private static final ConcurrentHashMap<UserSessionKey, List<UserSessionData>> userSessions = new ConcurrentHashMap<>(); 29 private static final ConcurrentHashMap<UserSessionKey, List<UserSessionData>> userSessions = new ConcurrentHashMap<>();
30 - private static final long INACTIVITY_TIMEOUT = 60 * 60 * 1000; 30 + private static final long INACTIVITY_TIMEOUT = 8 * 60 * 60 * 1000;
31 private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); 31 private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
32 32
33 static { 33 static {
......
...@@ -557,7 +557,7 @@ public class OrderServiceRpcClient { ...@@ -557,7 +557,7 @@ public class OrderServiceRpcClient {
557 .setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId()) 557 .setShouldCreateCustomerId(createOrderDto.getShouldCreateCustomerId())
558 .setShouldCreateCustomerId(true).setCustomerId(createOrderDto.getCustomerId()) 558 .setShouldCreateCustomerId(true).setCustomerId(createOrderDto.getCustomerId())
559 .setStallId(createOrderDto.getStallId()) 559 .setStallId(createOrderDto.getStallId())
560 - .setStatus(createOrderDto.getStatus() != null ? createOrderDto.getStatus() : orderStatus) 560 + .setStatus(orderStatus)
561 .setAddress(createOrderDto.getAddress()) 561 .setAddress(createOrderDto.getAddress())
562 .setClientId(createOrderDto.getClientId()) 562 .setClientId(createOrderDto.getClientId())
563 .setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty()).setOpenId(LoginContextHolder.getOpenId()) 563 .setShouldCreateOpenId(!LoginContextHolder.getOpenId().isEmpty()).setOpenId(LoginContextHolder.getOpenId())
...@@ -622,7 +622,7 @@ public class OrderServiceRpcClient { ...@@ -622,7 +622,7 @@ public class OrderServiceRpcClient {
622 final var userAuthData = new ArrayList<UserAuthData>(); 622 final var userAuthData = new ArrayList<UserAuthData>();
623 userAuthData.addAll(clientOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.CLIENT).build()).collect(Collectors.toList())); 623 userAuthData.addAll(clientOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.CLIENT).build()).collect(Collectors.toList()));
624 userAuthData.addAll(enterpriseOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.KDS).build()).collect(Collectors.toList())); 624 userAuthData.addAll(enterpriseOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.KDS).build()).collect(Collectors.toList()));
625 - log.info("received userAuthData:{}", userAuthData); 625 + log.info("received userAuthData:{}", JsonUtil.writeAsJson(userAuthData));
626 try { 626 try {
627 WebSocketServer.sendMessageByUserTypes(List.of(UserTypeEnum.CLIENT, UserTypeEnum.KDS), userAuthData, data); 627 WebSocketServer.sendMessageByUserTypes(List.of(UserTypeEnum.CLIENT, UserTypeEnum.KDS), userAuthData, data);
628 } catch (IOException e) { 628 } catch (IOException e) {
......
...@@ -31,6 +31,7 @@ import com.infoloop.tianting.server.session.UserSessionKey; ...@@ -31,6 +31,7 @@ import com.infoloop.tianting.server.session.UserSessionKey;
31 import com.infoloop.tianting.server.session.UserTypeEnum; 31 import com.infoloop.tianting.server.session.UserTypeEnum;
32 import com.infoloop.tianting.utils.DateUtil; 32 import com.infoloop.tianting.utils.DateUtil;
33 import com.infoloop.tianting.utils.EncryptionUtil; 33 import com.infoloop.tianting.utils.EncryptionUtil;
34 +import com.infoloop.tianting.utils.JsonUtil;
34 import lombok.RequiredArgsConstructor; 35 import lombok.RequiredArgsConstructor;
35 import lombok.extern.slf4j.Slf4j; 36 import lombok.extern.slf4j.Slf4j;
36 import org.springframework.beans.factory.annotation.Autowired; 37 import org.springframework.beans.factory.annotation.Autowired;
...@@ -132,7 +133,7 @@ public class PayServiceClient { ...@@ -132,7 +133,7 @@ public class PayServiceClient {
132 } 133 }
133 } 134 }
134 135
135 - public boolean callback(PaymentCallbackDTO paymentCallbackDTO) { 136 + public boolean callback(PaymentCallbackDTO paymentCallbackDTO) {
136 log.info("callback request received: {}", paymentCallbackDTO); 137 log.info("callback request received: {}", paymentCallbackDTO);
137 try { 138 try {
138 final var paymentCallbackResult = xmlMapper.readValue(paymentCallbackDTO.getPayResult(), PaymentCallbackResult.class); 139 final var paymentCallbackResult = xmlMapper.readValue(paymentCallbackDTO.getPayResult(), PaymentCallbackResult.class);
...@@ -208,7 +209,7 @@ public class PayServiceClient { ...@@ -208,7 +209,7 @@ public class PayServiceClient {
208 final var userAuthData = new ArrayList<UserAuthData>(); 209 final var userAuthData = new ArrayList<UserAuthData>();
209 userAuthData.addAll(clientOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.CLIENT).build()).collect(Collectors.toList())); 210 userAuthData.addAll(clientOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.CLIENT).build()).collect(Collectors.toList()));
210 userAuthData.addAll(enterpriseOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.KDS).build()).collect(Collectors.toList())); 211 userAuthData.addAll(enterpriseOperatorIds.stream().map(e -> UserAuthData.builder().operatorId(e).userType(UserTypeEnum.KDS).build()).collect(Collectors.toList()));
211 - log.info("received userAuthData:{}", userAuthData); 212 + log.info("received userAuthData:{}", JsonUtil.writeAsJson(userAuthData));
212 try { 213 try {
213 WebSocketServer.sendMessageByUserTypes(List.of(UserTypeEnum.CLIENT, UserTypeEnum.KDS), userAuthData, createOrderData); 214 WebSocketServer.sendMessageByUserTypes(List.of(UserTypeEnum.CLIENT, UserTypeEnum.KDS), userAuthData, createOrderData);
214 } catch (IOException e) { 215 } catch (IOException e) {
......