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<OrderGoods> 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<OrderGoods> 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) {