From 1be13586d64efd4f6736f7d05b7cebd1e5246a5a Mon Sep 17 00:00:00 2001
From: panshuling321 <panshuling321@163.com>
Date: Fri, 8 Apr 2022 17:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9B=B4=E6=96=B0=E6=B5=81?=
 =?UTF-8?q?=E9=87=8F=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/XhpcActivityInternetServiceImpl.java | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java
index 765f6743..47b689c9 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/XhpcActivityInternetServiceImpl.java
@@ -52,8 +52,28 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ
     public boolean insertDomain(XhpcActivityInternetDomain domain) {
         internetMapper.insert(domain);
 
+        List<XhpcActivityFormulaDomain> formulaDomainList = getFormulaFullList(domain);
+        formulaMapper.insertBatch(formulaDomainList);
+        return true;
+    }
+
+
+    @Override
+    public boolean updateDomain(XhpcActivityInternetDomain domain) {
+        internetMapper.updateByPrimaryKey(domain);
+        formulaMapper.deleteByActivityId(domain.getActivityId());
+
+        List<XhpcActivityFormulaDomain> formulaDomainList = getFormulaFullList(domain);
+        formulaMapper.insertBatch(formulaDomainList);
+        return true;
+    }
+
+
+
+    private List<XhpcActivityFormulaDomain> getFormulaFullList(XhpcActivityInternetDomain domain){
+
         boolean isFullDay = false;
-        Integer index = 0;
+        int index = 0;
         List<XhpcActivityFormulaDomain> formulaDomainList = domain.getFormulaList();
         List<XhpcActivityFormulaDomain> formulaDomains = new ArrayList<>();
         String startTime = "00:00:00", endTime="24:00:00";
@@ -102,26 +122,8 @@ public class XhpcActivityInternetServiceImpl implements XhpcActivityInternetServ
             }
 
         }
+        return formulaDomains;
 
-        formulaMapper.insertBatch(formulaDomains);
-        return true;
-    }
-
-
-    @Override
-    public boolean updateDomain(XhpcActivityInternetDomain domain) {
-        internetMapper.updateByPrimaryKey(domain);
-        formulaMapper.deleteByActivityId(domain.getActivityId());
-
-        for (XhpcActivityFormulaDomain formulaDomain : domain.getFormulaList()) {
-            formulaDomain.setActivityId(domain.getActivityId());
-            formulaDomain.setCreateBy(domain.getCreateBy());
-            formulaDomain.setUpdateBy(domain.getUpdateBy());
-            formulaMapper.insert(formulaDomain);
-        }
-
-
-        return true;
     }