From d798bf8f267042fbad47915b1a834b8aa87450fa Mon Sep 17 00:00:00 2001 From: Yifei Kuang Date: Mon, 9 Dec 2024 16:49:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=8E=E5=8F=B0=E4=B8=8B=E5=8D=95=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ghy/web/controller/order/OrderController.java | 5 +++-- .../com/ghy/web/controller/order/OrderDetailController.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 88bc5ecc..e431eddb 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -267,6 +267,7 @@ public class OrderController extends BaseController { orderMaster.setGoodsBrand(request.getGoodsBrand()); orderMaster.setGoodsSpecification(request.getGoodsSpecification()); orderMaster.setConsultMode(request.getConsultMode()); + orderMaster.setRemark(request.getRemark()); if("01".equalsIgnoreCase(orderMaster.getConsultMode())){ orderMaster.setOrderMode("02"); orderMaster.setPayMode("01"); @@ -1548,9 +1549,9 @@ public class OrderController extends BaseController { List orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); // 商品信息 - GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); +// GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); - Goods goods = goodsService.selectById(goodsStandard.getGoodsId()); + Goods goods = goodsService.selectById(orderMaster.getGoodsId()); // 填充商品三级类目 if(goods.getDeptGoodsCategoryId() != null){ Long categoryId = null; diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 047c5f60..4b75b4ff 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -338,7 +338,7 @@ public class OrderDetailController extends BaseController { List orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); // 商品信息 - GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); +// GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); Goods goods = goodsService.selectById(orderMaster.getGoodsId()); if (goods != null) {