zhuyifan

fix

package com.tianting.infoloop.service.grpc;
import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_MASTER;
import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_SLAVE;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -49,23 +47,24 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde
import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderDetailRpcResponse;
import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse;
import com.tianting.infoloop.grpc.exampleservice.BatchCreateTestExampleDbRpcResponse;
import com.tianting.infoloop.model.db.OrderDb;
import com.tianting.infoloop.model.db.OrderDetailDb;
import com.tianting.infoloop.model.db.OrderOperationRecordsDb;
import com.tianting.infoloop.model.db.TestExampleDb;
import com.tianting.infoloop.service.OrderDbService;
import com.tianting.infoloop.service.OrderDetailDbService;
import com.tianting.infoloop.service.OrderOperationRecordDbService;
import com.tianting.infoloop.utils.ProtoBeanUtil;
import io.grpc.Status;
import io.grpc.stub.StreamObserver;
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;
import java.util.stream.Collectors;
import static com.tianting.infoloop.constants.ConfigConstants.DATA_SOURCE_MASTER;
@Slf4j
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
......@@ -220,11 +219,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
}
if (request.getShouldFilterPayTimeStart()) {
queryWrapper.ge(OrderDb::getPayTime, request.getPayTimeStart());
queryWrapper.ge(OrderDb::getPayTime, LocalDateTimeUtil.of(request.getPayTimeStart()));
}
if (request.getShouldFilterPayTimeEnd()) {
queryWrapper.le(OrderDb::getPayTime, request.getPayTimeEnd());
queryWrapper.le(OrderDb::getPayTime, LocalDateTimeUtil.of(request.getPayTimeEnd()));
}
if (request.getShouldFilterPayStatus()) {
......@@ -232,11 +231,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
}
if (request.getShouldFilterMealTimeStart()) {
queryWrapper.ge(OrderDb::getMealTime, request.getMealTimeStart());
queryWrapper.ge(OrderDb::getMealTime, LocalDateTimeUtil.of(request.getMealTimeStart()));
}
if (request.getShouldFilterMealTimeEnd()) {
queryWrapper.le(OrderDb::getMealTime, request.getMealTimeEnd());
queryWrapper.le(OrderDb::getMealTime, LocalDateTimeUtil.of(request.getMealTimeEnd()));
}
if (request.getShouldFilterRoomNo()) {
......@@ -256,11 +255,11 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
}
if (request.getShouldFilterCreatedAtStart()) {
queryWrapper.ge(OrderDb::getCreatedAt, request.getCreatedAtStart());
queryWrapper.ge(OrderDb::getCreatedAt, LocalDateTimeUtil.of(request.getCreatedAtStart()));
}
if (request.getShouldFilterCreatedAtEnd()) {
queryWrapper.le(OrderDb::getCreatedAt, request.getCreatedAtEnd());
queryWrapper.le(OrderDb::getCreatedAt, LocalDateTimeUtil.of(request.getCreatedAtEnd()));
}
if (request.getShouldFilterIsRead()) {
......
......@@ -26,5 +26,6 @@ mybatis-plus.global-config.db-config.logic-not-delete-value=0
mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
mybatis-plus.mapper-locations=classpath*:mapper/*.xml
mybatis-plus.typeAliasesPackage=com.tianting.infoloop.model.db
tenant.enable=true
tenant.enable=false
tenant.column=enterpriseId
......