zhuyifan

fix

......@@ -3,13 +3,13 @@ package com.tianting.infoloop.model.db;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* order operation records DB
* @TableName client_customer_order_operation_records
......@@ -31,13 +31,13 @@ public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> impl
private Integer type;
private JsonNode originalOrderJson;
private String originalOrderJson;
private JsonNode adjustOrderJson;
private String adjustOrderJson;
private JsonNode originalOrderDetailJson;
private String originalOrderDetailJson;
private JsonNode adjustOrderDetailJson;
private String adjustOrderDetailJson;
private String operator;
......
......@@ -3,23 +3,20 @@ package com.tianting.infoloop.service.impl;
import cn.hutool.extra.spring.SpringUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest;
import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest;
import com.tianting.infoloop.mapper.OrderOperationRecordDbMapper;
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.service.OrderOperationRecordDbService;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
@Service
@RequiredArgsConstructor(onConstructor_ = @Autowired)
......@@ -32,7 +29,6 @@ public class OrderOperationRecordDbServiceImpl extends
@Override
public List<OrderOperationRecordsDb> batchCreateOrderOperationRecords(
BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest) {
ObjectMapper objectMapper = new ObjectMapper();
var list = batchCreateOrderOperationRecordsRequest.getCreationsList().stream()
.map(creation -> {
OrderOperationRecordsDb orderOperationRecordsDb = new OrderOperationRecordsDb();
......@@ -43,16 +39,16 @@ public class OrderOperationRecordDbServiceImpl extends
orderOperationRecordsDb.setOrderId(creation.getOrderId());
orderOperationRecordsDb.setType(creation.getTypeValue());
if (creation.getShouldCreateAdjustOrderJson()) {
orderOperationRecordsDb.setAdjustOrderJson(objectMapper.valueToTree(creation.getAdjustOrderJson()));
orderOperationRecordsDb.setAdjustOrderJson(creation.getAdjustOrderJson());
}
if (creation.getShouldCreateOriginalOrderJson()) {
orderOperationRecordsDb.setOriginalOrderJson(objectMapper.valueToTree(creation.getOriginalOrderJson()));
orderOperationRecordsDb.setOriginalOrderJson(creation.getOriginalOrderJson());
}
if (creation.getShouldCreateAdjustOrderDetailJson()) {
orderOperationRecordsDb.setAdjustOrderDetailJson(objectMapper.valueToTree(creation.getAdjustOrderDetailJson()));
orderOperationRecordsDb.setAdjustOrderDetailJson(creation.getAdjustOrderDetailJson());
}
if (creation.getShouldCreateOriginalOrderDetailJson()) {
orderOperationRecordsDb.setOriginalOrderDetailJson(objectMapper.valueToTree(creation.getOriginalOrderJson()));
orderOperationRecordsDb.setOriginalOrderDetailJson(creation.getOriginalOrderJson());
}
return orderOperationRecordsDb;
})
......