wangyingyang

fix

......@@ -450,6 +450,19 @@ public class OrderDbDTO {
private String phone;
}
@Data
@Builder
@ToString
@ApiModel(description = "订单详情操作记录")
public static class OrderDetailOperationDto {
private Integer id;
private Integer skuId;
private String skuName;
private Integer count;
private String adjustSkuRemark;
private String serveStatus;
}
@Data
@Builder
......
......@@ -47,6 +47,7 @@ import com.infoloop.tianting.model.dto.OrderDbDTO.CreateOrderResponse;
import com.infoloop.tianting.model.dto.OrderDbDTO.MealDetailDto;
import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailBatchUpdateDto;
import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailDto;
import com.infoloop.tianting.model.dto.OrderDbDTO.OrderDetailOperationDto;
import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByConditionDto;
import com.infoloop.tianting.model.dto.OrderDbDTO.QueryOrderByPaginationDto;
import com.infoloop.tianting.model.dto.OrderDbDTO.UpdateOrderDto;
......@@ -323,14 +324,30 @@ public class OrderServiceRpcClient {
String newDetailStr = "";
final var newDetail = newOrderDetails.stream().filter(n -> n.getId().equals(orgionalDetail.getId())).findFirst();
if (newDetail.isPresent()) {
final var newOrderDetailOperation = OrderDetailOperationDto.builder()
.id(newDetail.get().getId())
.skuId(newDetail.get().getSkuId())
.skuName(newDetail.get().getShowName())
.count(newDetail.get().getCount())
.adjustSkuRemark(newDetail.get().getAdjustSkuRemark())
.serveStatus(newDetail.get().getServeStatus().name())
.build();
try {
newDetailStr = objectMapper.writeValueAsString(newDetail.get());
newDetailStr = objectMapper.writeValueAsString(List.of(newOrderDetailOperation));
} catch (JsonProcessingException e) {
System.out.println("orderDetail json 转换失败");
}
}
try {
orgionalDetailStr = objectMapper.writeValueAsString(orgionalDetail);
final var orgionalOrderDetailOperation = OrderDetailOperationDto.builder()
.id(orgionalDetail.getId())
.skuId(orgionalDetail.getSkuId())
.skuName(orgionalDetail.getShowName())
.count(orgionalDetail.getCount())
.adjustSkuRemark(orgionalDetail.getAdjustSkuRemark())
.serveStatus(orgionalDetail.getServeStatus().name())
.build();
orgionalDetailStr = objectMapper.writeValueAsString(List.of(orgionalOrderDetailOperation));
} catch (JsonProcessingException e) {
System.out.println("orderDetail json 转换失败");
}
......