diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java index 4b8b0e78..acac46e4 100644 --- a/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java +++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java @@ -141,17 +141,17 @@ public class OrderItemInfo implements Serializable { private String byzd2; /** - * 备用字段3 + * 备用字段3(外币金额) */ private String byzd3; /** - * 备用字段4 + * 备用字段4(外币税额) */ private String byzd4; /** - * 备用字段5 + * 备用字段5(外汇汇率字段) */ private String byzd5; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 4fa4e30d..efb5a4cf 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -224,7 +224,7 @@ public class OrderInfoController { @SysLog(operation = "编辑订单rest接口", operationDesc = "订单编辑", key = "订单编辑") public R updateOrderInfo(@ApiParam(name = "orderInfo", value = "订单信息", required = true) @RequestBody String data) { log.info("{}订单详情编辑,订单信息为:{}", LOGGER_MSG, data); - + // 增加外汇汇率字段使用byzd4冗余字段 CommonOrderInfo commonOrderInfo; try { commonOrderInfo = JSON.parseObject(data, CommonOrderInfo.class); @@ -244,6 +244,9 @@ public class OrderInfoController { if (orderItemInfo == null || orderItemInfo.size() <= 0) { return R.error(OrderInfoContentEnum.HANDLE_ISSUE_202009); } + orderItemInfo.stream().forEach(item->{ + + }); String fpqqlsh = orderInfo.getFpqqlsh(); try {