zhuyifan

fix

......@@ -9,7 +9,6 @@ import brave.propagation.B3Propagation;
import brave.propagation.CurrentTraceContext;
import brave.propagation.TraceContext;
import brave.sampler.Sampler;
import com.tianting.infoloop.service.grpc.ExampleGrpcService;
import com.tianting.infoloop.service.grpc.OrderGrpcService;
import io.grpc.Server;
import io.grpc.ServerInterceptor;
......
package com.tianting.infoloop.mapper;
import com.tianting.infoloop.inject.MyBaseMapper;
import com.tianting.infoloop.model.db.OrderOperationRecordsDb;
import com.tianting.infoloop.model.db.OrderOperationRecordDb;
public interface OrderOperationRecordDbMapper extends MyBaseMapper<OrderOperationRecordsDb> {
public interface OrderOperationRecordDbMapper extends MyBaseMapper<OrderOperationRecordDb> {
}
......
package com.tianting.infoloop.model.db;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
......@@ -18,17 +21,15 @@ import java.time.LocalDateTime;
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@TableName(value ="client_customer_order_operation_records")
public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> implements Serializable {
public class OrderOperationRecordDb extends Model<OrderOperationRecordDb> implements Serializable {
@TableId
@TableId(type = IdType.AUTO)
private Integer id;
private Integer enterpriseId;
private Integer orderId;
private Integer orderDetailId;
private Integer type;
private String originalOrderJson;
......@@ -43,6 +44,7 @@ public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> impl
private Integer createdBy;
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createdAt;
private Integer creationSource;
......
package com.tianting.infoloop.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest;
import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest;
import com.tianting.infoloop.grpc.exampleservice.TestExampleDbCreation;
import com.tianting.infoloop.mapper.OrderDetailMapper;
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.model.db.OrderOperationRecordDb;
import java.util.List;
public interface OrderOperationRecordDbService extends IService<OrderOperationRecordsDb> {
public interface OrderOperationRecordDbService extends IService<OrderOperationRecordDb> {
List<OrderOperationRecordsDb> batchCreateOrderOperationRecords(
List<OrderOperationRecordDb> batchCreateOrderOperationRecords(
BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest);
List<OrderOperationRecordsDb> getOrderOperationRecordsByOrderId(
List<OrderOperationRecordDb> getOrderOperationRecordsByOrderId(
GetOrderOperationRecordsByOrderIdRequest getOrderOperationRecordsByOrderIdRequest);
}
......
......@@ -53,7 +53,7 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde
import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse;
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.OrderOperationRecordDb;
import com.tianting.infoloop.service.OrderDbService;
import com.tianting.infoloop.service.OrderDetailDbService;
import com.tianting.infoloop.service.OrderOperationRecordDbService;
......@@ -581,7 +581,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
try {
final var data = orderOperationRecordDbService.batchCreateOrderOperationRecords(request);
builder.setIsCreated(data.size() == request.getCreationsCount()).addAllIds(data.stream().map(
OrderOperationRecordsDb::getId).collect(Collectors.toList()));
OrderOperationRecordDb::getId).collect(Collectors.toList()));
} catch (final Exception e) {
log.error("batchCreateOrderOperationRecords error;", e);
responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......
......@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest;
import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest;
import com.tianting.infoloop.mapper.OrderOperationRecordDbMapper;
import com.tianting.infoloop.model.db.OrderOperationRecordsDb;
import com.tianting.infoloop.model.db.OrderOperationRecordDb;
import com.tianting.infoloop.service.OrderOperationRecordDbService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
......@@ -21,45 +21,45 @@ import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
public class OrderOperationRecordDbServiceImpl extends
ServiceImpl<OrderOperationRecordDbMapper, OrderOperationRecordsDb>
ServiceImpl<OrderOperationRecordDbMapper, OrderOperationRecordDb>
implements OrderOperationRecordDbService {
private final OrderOperationRecordDbMapper orderOperationRecordDbMapper;
@Override
public List<OrderOperationRecordsDb> batchCreateOrderOperationRecords(
public List<OrderOperationRecordDb> batchCreateOrderOperationRecords(
BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest) {
var list = batchCreateOrderOperationRecordsRequest.getCreationsList().stream()
.map(creation -> {
OrderOperationRecordsDb orderOperationRecordsDb = new OrderOperationRecordsDb();
orderOperationRecordsDb.setCreationSource(batchCreateOrderOperationRecordsRequest.getCreationSourceValue());
orderOperationRecordsDb.setCreatedBy(batchCreateOrderOperationRecordsRequest.getCreatedBy());
orderOperationRecordsDb.setEnterpriseId(batchCreateOrderOperationRecordsRequest.getEnterpriseId());
orderOperationRecordsDb.setOperator(batchCreateOrderOperationRecordsRequest.getOperator());
orderOperationRecordsDb.setOrderId(creation.getOrderId());
orderOperationRecordsDb.setType(creation.getTypeValue());
OrderOperationRecordDb orderOperationRecordDb = new OrderOperationRecordDb();
orderOperationRecordDb.setCreationSource(batchCreateOrderOperationRecordsRequest.getCreationSourceValue());
orderOperationRecordDb.setCreatedBy(batchCreateOrderOperationRecordsRequest.getCreatedBy());
orderOperationRecordDb.setEnterpriseId(batchCreateOrderOperationRecordsRequest.getEnterpriseId());
orderOperationRecordDb.setOperator(batchCreateOrderOperationRecordsRequest.getOperator());
orderOperationRecordDb.setOrderId(creation.getOrderId());
orderOperationRecordDb.setType(creation.getTypeValue());
if (creation.getShouldCreateAdjustOrderJson()) {
orderOperationRecordsDb.setAdjustOrderJson(creation.getAdjustOrderJson());
orderOperationRecordDb.setAdjustOrderJson(creation.getAdjustOrderJson());
}
if (creation.getShouldCreateOriginalOrderJson()) {
orderOperationRecordsDb.setOriginalOrderJson(creation.getOriginalOrderJson());
orderOperationRecordDb.setOriginalOrderJson(creation.getOriginalOrderJson());
}
if (creation.getShouldCreateAdjustOrderDetailJson()) {
orderOperationRecordsDb.setAdjustOrderDetailJson(creation.getAdjustOrderDetailJson());
orderOperationRecordDb.setAdjustOrderDetailJson(creation.getAdjustOrderDetailJson());
}
if (creation.getShouldCreateOriginalOrderDetailJson()) {
orderOperationRecordsDb.setOriginalOrderDetailJson(creation.getOriginalOrderJson());
orderOperationRecordDb.setOriginalOrderDetailJson(creation.getOriginalOrderJson());
}
return orderOperationRecordsDb;
return orderOperationRecordDb;
})
.collect(Collectors.toList());
return SpringUtil.getBean(OrderOperationRecordDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList();
}
@Override
public List<OrderOperationRecordsDb> getOrderOperationRecordsByOrderId(
public List<OrderOperationRecordDb> getOrderOperationRecordsByOrderId(
GetOrderOperationRecordsByOrderIdRequest getOrderOperationRecordsByOrderIdRequest) {
QueryWrapper<OrderOperationRecordsDb> wrapper = new QueryWrapper<>();
QueryWrapper<OrderOperationRecordDb> wrapper = new QueryWrapper<>();
wrapper.eq("enterpriseId", getOrderOperationRecordsByOrderIdRequest.getEnterpriseId())
.eq("createdBy", getOrderOperationRecordsByOrderIdRequest.getOrderId())
.orderByDesc("createdAt");
......