From 346169a07ef6029ce401f43a0b916416d915d4cb Mon Sep 17 00:00:00 2001
From: HH <hhawking@qq.com>
Date: Thu, 23 Feb 2023 15:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=A8=A1=E6=9D=BF=E7=9A=84Se?=
 =?UTF-8?q?rvice=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/OrderTemplateController.java        | 19 +++++++++++++++++++
 .../impl/OrderTemplateServiceImpl.java        | 19 +++++++++++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java
new file mode 100644
index 00000000..63a6cf0a
--- /dev/null
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderTemplateController.java
@@ -0,0 +1,19 @@
+package com.ghy.web.controller.order;
+
+import com.ghy.order.service.OrderTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Controller
+@RequestMapping("order/template")
+public class OrderTemplateController {
+
+    @Resource
+    private OrderTemplateService orderTemplateService;
+
+
+}
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java
index e90d0626..9439a0c9 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderTemplateServiceImpl.java
@@ -23,6 +23,7 @@ public class OrderTemplateServiceImpl implements OrderTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public int insert(OrderTemplate orderTemplate) {
         int count = mapper.insert(orderTemplate);
+        // 保存选中的商品信息
         saveGoods(orderTemplate);
         return count;
     }
@@ -31,11 +32,15 @@ public class OrderTemplateServiceImpl implements OrderTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public int update(OrderTemplate orderTemplate) {
         int count = mapper.update(orderTemplate);
+        // 全量替换模板的商品信息
         mapper.deleteGoods(orderTemplate.getId());
         saveGoods(orderTemplate);
         return count;
     }
 
+    /**
+     * 保存订单模板中选中的商品信息
+     */
     private void saveGoods(OrderTemplate orderTemplate) {
         List<OrderTemplateGoods> goods = orderTemplate.getGoods();
         if (!CollectionUtils.isEmpty(goods)) {
@@ -49,7 +54,9 @@ public class OrderTemplateServiceImpl implements OrderTemplateService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int delete(Long id) {
+        // 删除模板关联的商品信息
         mapper.deleteGoods(id);
+        // 删除模板
         return mapper.delete(id);
     }
 
@@ -66,7 +73,10 @@ public class OrderTemplateServiceImpl implements OrderTemplateService {
 
     @Override
     public OrderTemplate selectById(Long id) {
-        return mapper.selectById(id);
+        List<OrderTemplateGoods> goods = mapper.selectGoods(id);
+        OrderTemplate orderTemplate = mapper.selectById(id);
+        orderTemplate.setGoods(goods);
+        return orderTemplate;
     }
 
     @Override
@@ -74,7 +84,12 @@ public class OrderTemplateServiceImpl implements OrderTemplateService {
         if (CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         } else {
-            return mapper.selectByIds(ids);
+            List<OrderTemplate> orderTemplates = mapper.selectByIds(ids);
+            for (OrderTemplate item : orderTemplates) {
+                List<OrderTemplateGoods> goods = mapper.selectGoods(item.getId());
+                item.setGoods(goods);
+            }
+            return orderTemplates;
         }
     }