From 776234a0c37c917b5d5bb3ea85c2792496a493f8 Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Fri, 12 May 2023 10:25:24 +0800
Subject: [PATCH] :sparkles: feature(*): 公共池报表新增字段

---
 fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/pool/StammkundePool.java              |  4 ++++
 fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/pool/StammkundePool.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/pool/StammkundePool.java
index b42f80c..9e16909 100644
--- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/pool/StammkundePool.java
+++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/db/pool/StammkundePool.java
@@ -77,4 +77,8 @@ public class StammkundePool extends BaseAuditableTimeEntity<StammkundePool, Long
      * 集团id
      */
     private Long groupId;
+    /**
+     * 公共池来源【针对自然进店的标识】
+     */
+    private Boolean fromPublic;
 }
diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
index 215f892..f78a1e9 100644
--- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
+++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java
@@ -54,6 +54,7 @@ import org.springframework.util.CollectionUtils;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 import static cn.fw.common.businessvalidator.Validator.BV;
 
@@ -397,9 +398,8 @@ public class CustomerChangeBizService extends AbstractCustomerService {
 
         if (Objects.isNull(customer.getAdviserId()) && Objects.isNull(customer.getShopId())) {
             publicPoolService.removeByCustomerId(customer.getId(), customer.getGroupId());
-            create(customer, adviserId, shopId);
+            create(customer, adviserId, shopId, r -> r.setFromPublic(Boolean.TRUE));
         }
-
         return updated;
     }
 
@@ -421,6 +421,10 @@ public class CustomerChangeBizService extends AbstractCustomerService {
 
 
     private void create(Customer customer, Long adviserId, Long shopId) {
+        create(customer, adviserId, shopId, null);
+    }
+
+    private void create(Customer customer, Long adviserId, Long shopId, Consumer<StammkundePool> cs) {
         StammkundePool stammkundePool = createSimpleInfo(customer, adviserId);
         stammkundePool.setSources(StammkundeSourcesEnum.NATURAL);
         stammkundePool.setShopId(shopId);
@@ -428,6 +432,9 @@ public class CustomerChangeBizService extends AbstractCustomerService {
         stammkundePool.setAktiv(Boolean.TRUE);
         stammkundePool.setActivationTime(new Date());
         stammkundePool.setCreateTime(new Date());
+        if (cs != null) {
+            cs.accept(stammkundePool);
+        }
         stammkundePoolService.save(stammkundePool);
     }
 
--
libgit2 0.22.2