zhuyifan

fix

1 package com.tianting.infoloop.service.grpc; 1 package com.tianting.infoloop.service.grpc;
2 2
3 3
4 -import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_MASTER; 4 +import cn.hutool.core.date.LocalDateTimeUtil;
5 -import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_SLAVE;
6 -
7 import com.baomidou.dynamic.datasource.annotation.DS; 5 import com.baomidou.dynamic.datasource.annotation.DS;
8 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
9 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 7 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...@@ -49,23 +47,24 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde ...@@ -49,23 +47,24 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde
49 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderDetailRpcResponse; 47 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderDetailRpcResponse;
50 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest; 48 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
51 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse; 49 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse;
52 -import com.tianting.infoloop.grpc.exampleservice.BatchCreateTestExampleDbRpcResponse;
53 import com.tianting.infoloop.model.db.OrderDb; 50 import com.tianting.infoloop.model.db.OrderDb;
54 import com.tianting.infoloop.model.db.OrderDetailDb; 51 import com.tianting.infoloop.model.db.OrderDetailDb;
55 import com.tianting.infoloop.model.db.OrderOperationRecordsDb; 52 import com.tianting.infoloop.model.db.OrderOperationRecordsDb;
56 -import com.tianting.infoloop.model.db.TestExampleDb;
57 import com.tianting.infoloop.service.OrderDbService; 53 import com.tianting.infoloop.service.OrderDbService;
58 import com.tianting.infoloop.service.OrderDetailDbService; 54 import com.tianting.infoloop.service.OrderDetailDbService;
59 import com.tianting.infoloop.service.OrderOperationRecordDbService; 55 import com.tianting.infoloop.service.OrderOperationRecordDbService;
60 import com.tianting.infoloop.utils.ProtoBeanUtil; 56 import com.tianting.infoloop.utils.ProtoBeanUtil;
61 import io.grpc.Status; 57 import io.grpc.Status;
62 import io.grpc.stub.StreamObserver; 58 import io.grpc.stub.StreamObserver;
63 -import java.util.stream.Collectors;
64 import lombok.RequiredArgsConstructor; 59 import lombok.RequiredArgsConstructor;
65 import lombok.extern.slf4j.Slf4j; 60 import lombok.extern.slf4j.Slf4j;
66 import org.springframework.beans.factory.annotation.Autowired; 61 import org.springframework.beans.factory.annotation.Autowired;
67 import org.springframework.stereotype.Service; 62 import org.springframework.stereotype.Service;
68 63
64 +import java.util.stream.Collectors;
65 +
66 +import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_MASTER;
67 +
69 @Slf4j 68 @Slf4j
70 @Service 69 @Service
71 @RequiredArgsConstructor(onConstructor_ = @Autowired) 70 @RequiredArgsConstructor(onConstructor_ = @Autowired)
...@@ -220,11 +219,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -220,11 +219,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
220 } 219 }
221 220
222 if (request.getShouldFilterPayTimeStart()) { 221 if (request.getShouldFilterPayTimeStart()) {
223 - queryWrapper.ge(OrderDb::getPayTime, request.getPayTimeStart()); 222 + queryWrapper.ge(OrderDb::getPayTime, LocalDateTimeUtil.of(request.getPayTimeStart()));
224 } 223 }
225 224
226 if (request.getShouldFilterPayTimeEnd()) { 225 if (request.getShouldFilterPayTimeEnd()) {
227 - queryWrapper.le(OrderDb::getPayTime, request.getPayTimeEnd()); 226 + queryWrapper.le(OrderDb::getPayTime, LocalDateTimeUtil.of(request.getPayTimeEnd()));
228 } 227 }
229 228
230 if (request.getShouldFilterPayStatus()) { 229 if (request.getShouldFilterPayStatus()) {
...@@ -232,11 +231,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -232,11 +231,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
232 } 231 }
233 232
234 if (request.getShouldFilterMealTimeStart()) { 233 if (request.getShouldFilterMealTimeStart()) {
235 - queryWrapper.ge(OrderDb::getMealTime, request.getMealTimeStart()); 234 + queryWrapper.ge(OrderDb::getMealTime, LocalDateTimeUtil.of(request.getMealTimeStart()));
236 } 235 }
237 236
238 if (request.getShouldFilterMealTimeEnd()) { 237 if (request.getShouldFilterMealTimeEnd()) {
239 - queryWrapper.le(OrderDb::getMealTime, request.getMealTimeEnd()); 238 + queryWrapper.le(OrderDb::getMealTime, LocalDateTimeUtil.of(request.getMealTimeEnd()));
240 } 239 }
241 240
242 if (request.getShouldFilterRoomNo()) { 241 if (request.getShouldFilterRoomNo()) {
...@@ -256,11 +255,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -256,11 +255,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
256 } 255 }
257 256
258 if (request.getShouldFilterCreatedAtStart()) { 257 if (request.getShouldFilterCreatedAtStart()) {
259 - queryWrapper.ge(OrderDb::getCreatedAt, request.getCreatedAtStart()); 258 + queryWrapper.ge(OrderDb::getCreatedAt, LocalDateTimeUtil.of(request.getCreatedAtStart()));
260 } 259 }
261 260
262 if (request.getShouldFilterCreatedAtEnd()) { 261 if (request.getShouldFilterCreatedAtEnd()) {
263 - queryWrapper.le(OrderDb::getCreatedAt, request.getCreatedAtEnd()); 262 + queryWrapper.le(OrderDb::getCreatedAt, LocalDateTimeUtil.of(request.getCreatedAtEnd()));
264 } 263 }
265 264
266 if (request.getShouldFilterIsRead()) { 265 if (request.getShouldFilterIsRead()) {
......
...@@ -26,5 +26,6 @@ mybatis-plus.global-config.db-config.logic-not-delete-value=0 ...@@ -26,5 +26,6 @@ mybatis-plus.global-config.db-config.logic-not-delete-value=0
26 mybatis-plus.global-config.db-config.logic-delete-field=isDeleted 26 mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
27 mybatis-plus.mapper-locations=classpath*:mapper/*.xml 27 mybatis-plus.mapper-locations=classpath*:mapper/*.xml
28 mybatis-plus.typeAliasesPackage=com.tianting.infoloop.model.db 28 mybatis-plus.typeAliasesPackage=com.tianting.infoloop.model.db
29 -tenant.enable=true 29 +
30 +tenant.enable=false
30 tenant.column=enterpriseId 31 tenant.column=enterpriseId
......