From 54da5e3c9805bf7865727b7a1e73ee9c82244e50 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Thu, 2 Jun 2022 14:37:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=95=86=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderMasterController.java | 12 +++++++++++- .../main/java/com/ghy/order/domain/OrderGoods.java | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index ea4a25e8..f1696298 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -12,6 +12,7 @@ import com.ghy.customer.domain.Customer; import com.ghy.customer.domain.CustomerAddress; import com.ghy.customer.service.CustomerAddressService; import com.ghy.customer.service.CustomerService; +import com.ghy.goods.service.GoodsStandardService; import com.ghy.order.domain.OrderDetail; import com.ghy.order.domain.OrderGoods; import com.ghy.order.domain.OrderMaster; @@ -66,6 +67,8 @@ public class OrderMasterController extends BaseController { private FinancialDetailService financialDetailService; @Autowired private FinancialMasterService financialMasterService; + @Autowired + private GoodsStandardService goodsStandardService; @RequiresPermissions("order:master:view") @GetMapping() @@ -82,8 +85,15 @@ public class OrderMasterController extends BaseController { // 添加师傅信息 master.setWorker(workerService.selectById(master.getWorkerId())); + OrderGoods orderGoods = orderGoodsService.selectByOrderMasterId(master.getId()); + + // 添加商品信息 + if(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId())!=null){ + orderGoods.setGoodsStandard(goodsStandardService.selectByGoodsId(orderGoods.getGoodsId()).get(0)); + } + // 添加订单商品信息 - master.setOrderGoods(orderGoodsService.selectByOrderMasterId(master.getId())); + master.setOrderGoods(orderGoods); // 添加财务主单信息 master.setFinancialMaster(financialMasterService.selectByOrderMasterId(master.getId())); diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderGoods.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderGoods.java index 3cfd49fc..203d3e9c 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderGoods.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderGoods.java @@ -3,6 +3,7 @@ package com.ghy.order.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.ghy.common.annotation.Excel; import com.ghy.common.core.domain.BaseEntity; +import com.ghy.goods.domain.GoodsStandard; import lombok.Data; import java.util.Date; @@ -38,6 +39,8 @@ public class OrderGoods extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + private GoodsStandard goodsStandard; + public OrderGoods() { }