From 0fcc7efb8eef78c05c43d5a37c3303eef7fe41bc Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Mon, 4 Mar 2024 09:51:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 8 +++---- .../order/OrderDetailController.java | 23 ++++++++++++++++++- 2 files changed, 26 insertions(+), 5 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 96eee4c2..9a8a6c39 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 @@ -1400,9 +1400,9 @@ public class OrderController extends BaseController { if(two != null && two.getParentCategoryId() != null){ GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId()); if(three != null){ - goods.setGoodsName("【" + three.getGoodsCategoryName() + goods.setGoodsName(three.getGoodsCategoryName() + "-" + two.getGoodsCategoryName() - + "-" + one.getGoodsCategoryName() + "】"); + + "-" + one.getGoodsCategoryName()); } } } @@ -1525,9 +1525,9 @@ public class OrderController extends BaseController { if(two != null && two.getParentCategoryId() != null){ GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId()); if(three != null){ - goods.setGoodsName("【" + three.getGoodsCategoryName() + goods.setGoodsName(three.getGoodsCategoryName() + "-" + two.getGoodsCategoryName() - + "-" + one.getGoodsCategoryName() + "】"); + + "-" + one.getGoodsCategoryName()); } } } 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 5d5b9cbb..70845636 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 @@ -544,7 +544,28 @@ public class OrderDetailController extends BaseController { GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); Goods goods = goodsService.selectById(goodsStandard.getGoodsId()); - + // 填充商品三级类目 + if(goods.getDeptGoodsCategoryId() != null){ + DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(goods.getDeptGoodsCategoryId()); + if(deptGoodsCategory == null){ + deptGoodsCategory = new DeptGoodsCategory(); + deptGoodsCategory.setGoodsCategoryId(goods.getDeptGoodsCategoryId()); + } + if(deptGoodsCategory != null){ + GoodsCategory one = goodsCategoryService.selectById(deptGoodsCategory.getGoodsCategoryId()); + if(one != null && one.getParentCategoryId() != null){ + GoodsCategory two = goodsCategoryService.selectById(one.getParentCategoryId()); + if(two != null && two.getParentCategoryId() != null){ + GoodsCategory three = goodsCategoryService.selectById(two.getParentCategoryId()); + if(three != null){ + goods.setGoodsName(three.getGoodsCategoryName() + + "-" + two.getGoodsCategoryName() + + "-" + one.getGoodsCategoryName()); + } + } + } + } + } // 财务信息 FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(detail.getId()); BigDecimal detailPayMoney = financialDetail.getPayMoney();