From d1cac03848a7345508a9383ec13a56b38b0e74a3 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 9 Nov 2023 09:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=90=84=E7=A7=8D=E5=8F=96=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 10 +++++++++ .../order/OrderDetailController.java | 22 +++++++++++++++++++ .../order/OrderMasterController.java | 22 +++++++++++++++++++ .../ghy/web/pojo/vo/OrderListResponse.java | 7 ++++++ .../com/ghy/order/domain/OrderMaster.java | 6 +++++ .../mapper/order/OrderMasterMapper.xml | 14 ++++++++++-- 6 files changed, 79 insertions(+), 2 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 26c19f6e..d42c4440 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 @@ -237,6 +237,8 @@ public class OrderController extends BaseController { orderMaster.setPayType(0); orderMaster.setOrderMode(request.getOrderMode()); orderMaster.setPayMode(request.getPayMode()); + orderMaster.setGoodsBrand(request.getGoodsBrand()); + orderMaster.setGoodsSpecification(request.getGoodsSpecification()); // 存在登陆用户的情况下 if(getSysUser() != null){ orderMaster.setCreateBy(getSysUser().getUserId().toString()); @@ -1150,6 +1152,8 @@ public class OrderController extends BaseController { } // 编辑返回属性 + orderListResponse.setGoodsBrand(master.getGoodsBrand()); + orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setOrderMasterId(master.getId()); orderListResponse.setGoodsName(goods.getGoodsName()); orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl()); @@ -1275,6 +1279,8 @@ public class OrderController extends BaseController { // 编辑返回属性 + orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand()); + orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification()); orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailCode(detail.getCode()); orderListResponse.setOrderMasterId(detail.getOrderMasterId()); @@ -1385,6 +1391,8 @@ public class OrderController extends BaseController { } // 编辑返回属性 + orderListResponse.setGoodsBrand(master.getGoodsBrand()); + orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setOrderMasterId(master.getId()); orderListResponse.setGoodsName(goods.getGoodsName()); orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl()); @@ -1483,6 +1491,8 @@ public class OrderController extends BaseController { // List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // 编辑返回属性 + orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand()); + orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification()); orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailCode(detail.getCode()); orderListResponse.setOrderMasterId(detail.getOrderMasterId()); 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 a0e0f3d3..46986b48 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 @@ -306,6 +306,26 @@ public class OrderDetailController extends BaseController { GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); Goods goods = goodsService.selectById(goodsStandard.getGoodsId()); + if (goods != null) { + // 填充商品三级类目 + if(goods.getDeptGoodsCategoryId() != null){ + DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(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){ + orderListResponse.setTotalName(three.getGoodsCategoryName() + + "-" + two.getGoodsCategoryName() + + "-" + one.getGoodsCategoryName()); + } + } + } + } + } + } // 财务信息 FinancialDetail financialDetail = financialDetailService.selectByOrderDetailId(detail.getId()); @@ -552,6 +572,8 @@ public class OrderDetailController extends BaseController { // List afterServiceRecordList =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord); // 编辑返回属性 + orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand()); + orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification()); orderListResponse.setOrderDetailId(detail.getId()); orderListResponse.setOrderDetailCode(detail.getCode()); orderListResponse.setOrderMasterId(detail.getOrderMasterId()); 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 49586f86..c63b2919 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 @@ -294,6 +294,8 @@ public class OrderMasterController extends BaseController { } // 编辑返回属性 + orderListResponse.setGoodsBrand(master.getGoodsBrand()); + orderListResponse.setGoodsSpecification(master.getGoodsSpecification()); orderListResponse.setOrderMasterId(master.getId()); orderListResponse.setGoodsName(goods.getGoodsName()); orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl()); @@ -638,6 +640,26 @@ public class OrderMasterController extends BaseController { GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); Goods goods = goodsService.selectById(goodsStandard.getGoodsId()); + if (goods != null) { + // 填充商品三级类目 + if(goods.getDeptGoodsCategoryId() != null){ + DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.get(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){ + orderListResponse.setTotalName(three.getGoodsCategoryName() + + "-" + two.getGoodsCategoryName() + + "-" + one.getGoodsCategoryName()); + } + } + } + } + } + } // 补全商品服务区域 List goodsAreas = goodsAreaService.selectByGoodsId(goods.getGoodsId()); goods.setGoodsAreaList(goodsAreas); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 06697d4b..e689dab3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -16,6 +16,13 @@ import java.util.List; @Data public class OrderListResponse { + // 商品品牌 -- 后台发单才有 + private String goodsBrand; + // 商品规格 -- 后台发单才有 + private String goodsSpecification; + + private String totalName; + private String isCall; private Long orderMasterId; diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index fe97cda3..487ff924 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -189,4 +189,10 @@ public class OrderMaster extends BaseEntity { private List addressIds; private List orderMasterIdList; + + // 商品品牌 -- 后台发单才有 + private String goodsBrand; + // 商品规格 -- 后台发单才有 + private String goodsSpecification; + } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 45247981..a5caa8ce 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -29,6 +29,8 @@ + + @@ -65,7 +67,9 @@ timeout_, timeout_fine_times, is_call, - order_mode + order_mode, + goods_brand, + goods_specification FROM order_master @@ -96,7 +100,9 @@ om.timeout_, om.timeout_fine_times, om.is_call, - fm.server_money + fm.server_money, + om.goods_brand, + om.goods_specification FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id @@ -385,6 +391,8 @@ pay_time, rev_time, remark, + goods_brand, + goods_specification, expect_time_start, expect_time_end, create_by, @@ -405,6 +413,8 @@ #{payTime}, #{revTime}, #{remark}, + #{goodsBrand}, + #{goodsSpecification}, #{expectTimeStart}, #{expectTimeEnd}, #{createBy},