jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
b96fc84c 1 parent c3d7f95c

fix

Inline Side-by-side
Showing 3 changed files with 35 additions and 50 deletions
......@@ -81,6 +81,6 @@ public class SkuSellQuantity extends Model<OrderDetailDb> implements Serializabl
private Integer updateSource;
@TableLogic
private Integer isDeleted;
private Boolean isDeleted;
}
\ No newline at end of file
......
......@@ -663,11 +663,13 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
final StreamObserver<QuerySkuSellQuantitiesByStallRpcResponse> responseStreamObserver) {
final var builder = QuerySkuSellQuantitiesByStallRpcResponse.newBuilder();
try {
LambdaQueryWrapper<SkuSellQuantity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SkuSellQuantity::getEnterpriseId, request.getEnterpriseId());
queryWrapper.eq(SkuSellQuantity::getStallId, request.getStallId());
final var list = skuSellQuantityService.list(queryWrapper);
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(list, SingleSkuSellQuantityRpcResponse.class));
LambdaQueryWrapper<SkuSellQuantity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SkuSellQuantity::getEnterpriseId, request.getEnterpriseId());
queryWrapper.eq(SkuSellQuantity::getStallId, request.getStallId());
final var list = skuSellQuantityService.list(queryWrapper);
if (!list.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(list, SingleSkuSellQuantityRpcResponse.class));
}
} catch (final Exception e) {
log.error("querySkuSellQuantitiesByStall error;", e);
responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -682,12 +684,14 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
final StreamObserver<QuerySkuSellQuantitiesByStallAndSkuIdsRpcResponse> responseStreamObserver) {
final var builder = QuerySkuSellQuantitiesByStallAndSkuIdsRpcResponse.newBuilder();
try {
LambdaQueryWrapper<SkuSellQuantity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SkuSellQuantity::getEnterpriseId, request.getEnterpriseId());
queryWrapper.eq(SkuSellQuantity::getStallId, request.getStallId());
queryWrapper.in(SkuSellQuantity::getSkuId, request.getSkuIdsList());
final var list = skuSellQuantityService.list(queryWrapper);
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(list, SingleSkuSellQuantityRpcResponse.class));
LambdaQueryWrapper<SkuSellQuantity> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SkuSellQuantity::getEnterpriseId, request.getEnterpriseId());
queryWrapper.eq(SkuSellQuantity::getStallId, request.getStallId());
queryWrapper.in(SkuSellQuantity::getSkuId, request.getSkuIdsList());
final var list = skuSellQuantityService.list(queryWrapper);
if (!list.isEmpty()) {
builder.addAllResponses(ProtoBeanUtil.beanListToProtoList(list, SingleSkuSellQuantityRpcResponse.class));
}
} catch (final Exception e) {
log.error("querySkuSellQuantitiesByStallAndSkuIds error;", e);
responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......@@ -702,22 +706,22 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
final StreamObserver<BatchSaveSkuSellQuantitiesRpcResponse> responseStreamObserver) {
final var builder = BatchSaveSkuSellQuantitiesRpcResponse.newBuilder();
try {
List<SkuSellQuantity> skuSellQuantities = new ArrayList<>();
for (SkuSellQuantityModification skuSellQuantityModification : request.getSkuSellQuantityModificationsList()) {
SkuSellQuantity skuSellQuantity = new SkuSellQuantity();
skuSellQuantity.setId(skuSellQuantityModification.getId() == 0 ? null : skuSellQuantityModification.getId());
skuSellQuantity.setEnterpriseId(request.getEnterpriseId());
skuSellQuantity.setStallId(skuSellQuantityModification.getStallId());
skuSellQuantity.setSkuId(skuSellQuantityModification.getSkuId());
skuSellQuantity.setMaxSellQuantity(skuSellQuantityModification.getMaxSellQuantity());
skuSellQuantity.setCreatedBy(request.getUpdatedBy());
skuSellQuantity.setCreationSource(OrderSourceEnum.STALL_VALUE);
skuSellQuantity.setUpdatedBy(request.getUpdatedBy());
skuSellQuantity.setUpdateSource(OrderSourceEnum.STALL_VALUE);
skuSellQuantities.add(skuSellQuantity);
}
final boolean saveOrUpdateBatch = skuSellQuantityService.saveOrUpdateBatch(skuSellQuantities);
builder.setIsSaved(saveOrUpdateBatch);
List<SkuSellQuantity> skuSellQuantities = new ArrayList<>();
for (SkuSellQuantityModification skuSellQuantityModification : request.getSkuSellQuantityModificationsList()) {
SkuSellQuantity skuSellQuantity = new SkuSellQuantity();
skuSellQuantity.setId(skuSellQuantityModification.getId() == 0 ? null : skuSellQuantityModification.getId());
skuSellQuantity.setEnterpriseId(request.getEnterpriseId());
skuSellQuantity.setStallId(skuSellQuantityModification.getStallId());
skuSellQuantity.setSkuId(skuSellQuantityModification.getSkuId());
skuSellQuantity.setMaxSellQuantity(skuSellQuantityModification.getMaxSellQuantity());
skuSellQuantity.setCreatedBy(request.getUpdatedBy());
skuSellQuantity.setCreationSource(OrderSourceEnum.STALL_VALUE);
skuSellQuantity.setUpdatedBy(request.getUpdatedBy());
skuSellQuantity.setUpdateSource(OrderSourceEnum.STALL_VALUE);
skuSellQuantities.add(skuSellQuantity);
}
final boolean saveOrUpdateBatch = skuSellQuantityService.saveOrUpdateBatch(skuSellQuantities);
builder.setIsSaved(saveOrUpdateBatch);
} catch (final Exception e) {
log.error("batchSaveSkuSellQuantities error;", e);
responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......
package com.tianting.infoloop.utils;
import cn.hutool.core.date.LocalDateTimeUtil;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.TypeAdapter;
......@@ -11,7 +9,6 @@ import com.google.gson.stream.JsonWriter;
import com.google.protobuf.Message;
import com.google.protobuf.MessageOrBuilder;
import com.google.protobuf.util.JsonFormat;
import com.tianting.infoloop.constants.DateFormatterConstants;
import lombok.SneakyThrows;
import java.io.IOException;
......@@ -19,6 +16,7 @@ import java.lang.reflect.Constructor;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
......@@ -158,27 +156,10 @@ public class ProtoBeanUtil {
@Override
public LocalDate read(JsonReader in) throws IOException {
return LocalDate.ofInstant(Instant.ofEpochMilli(Long.parseLong(in.nextString())), DateFormatterConstants.CHINA_ZONE);
return LocalDate.ofInstant(Instant.ofEpochMilli(Long.parseLong(in.nextString())), ZoneId.of("Asia/Shanghai"));
}
}
)
// .registerTypeAdapter(JsonNode.class, new TypeAdapter<JsonNode>() {
// private final ObjectMapper objectMapper = new ObjectMapper();
// @Override
// public void write(JsonWriter out, JsonNode value) throws IOException {
// if (value!= null) {
// out.value(value.toString());
// } else {
// out.nullValue();
// }
// }
//
// @Override
// public JsonNode read(JsonReader in) throws IOException {
// return objectMapper.readValue(in.nextString(), JsonNode.class);
// }
// })
.create();
).create();
return gson;
}
......