From 64b5d1677272a375e6b8ac56f475f462d05723a0 Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Fri, 18 Mar 2022 16:46:06 +0800
Subject: [PATCH] 重构:订单取消逻辑

---
 zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index f7232e0..66890ed 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -316,7 +316,9 @@
                 num = 1D / achieveNewList.size();
             }
 
-            achieveNewDao.updateAchieveNumOfPeople(achieveNewList, num);
+            if (CollUtil.isNotEmpty(achieveNewList)) {
+                achieveNewDao.updateAchieveNumOfPeople(achieveNewList, num);
+            }
         }
 
     }
@@ -473,11 +475,23 @@
 
     @Override
     public List<DailyBeautyListVo> findDailyBeautyList(AchieveNew achieveNew, PaginationVO pageVo) {
-        return achieveNewDao.selectDailyBeautyList(achieveNew, pageVo);
+        List<DailyBeautyListVo> list = achieveNewDao.selectDailyBeautyList(achieveNew, pageVo);
+        if (CollUtil.isNotEmpty(list)) {
+            for (DailyBeautyListVo item : list) {
+                String pl = achieveNewDao.selectPlInfoByVipIdAndDate(item.getDatatime(), item.getVipId());
+                item.setProjInfo(pl);
+            }
+        }
+        return list;
     }
 
     @Override
     public int findDailyBeautyListTotal(AchieveNew achieveNew) {
         return achieveNewDao.selectDailyBeautyListTotal(achieveNew);
     }
+
+    @Override
+    public void removeByOrderId(Long orderId) {
+        achieveNewDao.deleteByOrderId(orderId);
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.1