From 9c66ddc3ce35a35eb69c50e5f6d68caf8d9b8137 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Mon, 23 Oct 2023 10:29:14 +0800
Subject: [PATCH] =?UTF-8?q?0=E5=85=83=E6=A0=B8=E9=94=80=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9Bbir=5Fact=E8=84=8F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BirActivityCenterGoodsServiceImpl.java    |  3 ++
 .../impl/VtbVerificationServiceImpl.java      | 36 +++++++++++++------
 .../bir/BirActivityCenterGoodsMapper.xml      | 26 +++++---------
 .../mapper/bms/BmsChannelPointMapper.xml      |  3 +-
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
index 5b93391d..e340919b 100644
--- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
@@ -88,6 +88,9 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl<BirActivityCe
         if(activityCenterGoodsAllList.size()<1){
             return;
         }
+        //添加支持：活动明细删除了，在bir_activity_center_goods还存在
+
+
         // 删除历史数据
         List<Long> activityIds = activityCenterGoodsAllList.stream().filter(a->a.getId()!=null)
                 .map(TbsActivityCenterGoods::getActivityId).collect(Collectors.toList());
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index 31669cfd..c0cad725 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -957,8 +957,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         List<VtbVerificationSubjectBo> subjectBoList = verificationBo.getSubjectList();
         int countCode = 1;
         for (VtbVerificationSubjectBo subjectBo : subjectBoList) {
+            boolean isCheckZero = subjectBo.getAmount().compareTo(BigDecimal.ZERO)==0;
             //忽略金额为0的数据
-            if (subjectBo.getAmount() == null || subjectBo.getAmount().compareTo(BigDecimal.ZERO) < 1) {
+            if (subjectBo.getAmount() != null && subjectBo.getAmount().compareTo(BigDecimal.ZERO) < 1) {
                 continue;
             }
             BmsSubject subject = subjectService.getById(subjectBo.getSubjectId());
@@ -970,17 +971,21 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                     break;
                 }
             }
-            List<VtbFundFlow> subjectFundFlowItems = funFlowListMap.get(subject.getId());
-            BigDecimal totalSubjectUsedAmount = BigDecimal.ZERO;
-            if (CollectionUtil.isNotEmpty(subjectFundFlowItems)) {
-                for (VtbFundFlow subjectFundFlowItem : subjectFundFlowItems) {
-                    totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectFundFlowItem.getUsedAmount());
+            //兼容支持非0元核销
+            if(!isCheckZero){
+                List<VtbFundFlow> subjectFundFlowItems = funFlowListMap.get(subject.getId());
+                BigDecimal totalSubjectUsedAmount = BigDecimal.ZERO;
+                if (CollectionUtil.isNotEmpty(subjectFundFlowItems)) {
+                    for (VtbFundFlow subjectFundFlowItem : subjectFundFlowItems) {
+                        totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectFundFlowItem.getUsedAmount());
+                    }
+                }
+                totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectBo.getAmount());
+                if (totalSubjectUsedAmount.compareTo(currentActivitySubject.getAmount()) > 0) {
+                    Assert.throwEx("费用类型[" + subject.getSubjectName() + "]超额");
                 }
             }
-            totalSubjectUsedAmount = totalSubjectUsedAmount.add(subjectBo.getAmount());
-            if (totalSubjectUsedAmount.compareTo(currentActivitySubject.getAmount()) > 0) {
-                Assert.throwEx("费用类型[" + subject.getSubjectName() + "]超额");
-            }
+
             //保存费用结果
             VtbVerificationSubject verificationSubject = new VtbVerificationSubject();
             verificationSubject.setVerificationSubCode(verificationCode+"_"+countCode);
@@ -1013,6 +1018,17 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     public void successCommit(Long verificationId) {
         log.info("活动核销提交成功。verificationId：{}",verificationId);
         VtbVerification verification = this.getById(verificationId);
+        boolean checkZero = verification.getAmount().compareTo(BigDecimal.ZERO)==0;
+        //0元核销只改变状态
+        if(checkZero){
+            fundFlowService.flushActivityAmount(verification.getActivityId());
+            verification = new VtbVerification();
+            verification.setId(verificationId);
+            verification.setVerificationState(VtbVerificationState.Finished.getCode());
+            verification.setFinishedTime(LocalDateTime.now());
+            super.updateById(verification);
+            return;
+        }
         TbsActivity activity = activityService.getById(verification.getActivityId());
         TbsCostApply costApply = costApplyService.getById(activity.getCostApplyId());
         //移除历史数据
diff --git a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml
index ad391a56..d43d7365 100644
--- a/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml
+++ b/src/main/resources/mapper/bir/BirActivityCenterGoodsMapper.xml
@@ -134,24 +134,16 @@
     </select>
 
     <select id="selectNoExistCenterGoods" resultType="com.qs.serve.modules.bir.entity.BirActivityCenterGoods">
-        select
-            bir_activity_center_goods.*
-        from bir_activity_center_goods
-                 left join tbs_activity_center_goods
-                           on tbs_activity_center_goods.id = bir_activity_center_goods.activity_center_goods_id
-                 left join `tbs_cost_apply`
-                           on `bir_activity_center_goods`.cost_apply_id = `tbs_cost_apply`.id
+        SELECT
+            *
+        FROM
+            bir_activity_center_goods
+                left join tbs_activity ON bir_activity_center_goods.activity_id = tbs_activity.id
+                left join `tbs_cost_apply` on `bir_activity_center_goods`.cost_apply_id = `tbs_cost_apply`.id
         where
-            (
-                    tbs_cost_apply.id is null
-                    and tbs_activity_center_goods.id is null
-                )
-           or (
-                tbs_activity_center_goods.del_flag = 1
-                and tbs_cost_apply.del_flag = 1
-                and tbs_cost_apply.cancel_flag = 1
-                and tbs_cost_apply.charge_state not in (2,3)
-            )
+            tbs_cost_apply.del_flag = 1 or tbs_cost_apply.id is null
+            and tbs_activity.id is null or tbs_activity.del_flag = 1
+
     </select>
 
     <select id="listMonthCusCenterVo"
diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml
index 059eed68..c6abae1c 100644
--- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml
+++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml
@@ -111,7 +111,7 @@
             <if test="query.updateBy != null and query.updateBy != ''"> and `bms_channel_point`.`update_by` = #{query.updateBy}</if>
             <if test="query.costFlag != null and query.costFlag != ''"> and `bms_channel_point`.`cost_flag` = #{query.costFlag}</if>
         </where>
-        ORDER BY `bms_channel_point`.`create_time` DESC
+        ORDER BY `bms_channel_point`.`id` DESC
     </select>
 
 
@@ -351,6 +351,7 @@
             <if test="query.id != null"> and `bms_channel_point`.`id` = #{query.id}</if>
             <if test="query.channelId != null"> and `bms_channel_point`.`channel_id` = #{query.channelId}</if>
             <if test="query.channelName != null and query.channelName != ''"> and `bms_channel_point`.`channel_name` like concat('%',#{query.channelName},'%') </if>
+            <if test="query.channelCode != null and query.channelCode != ''"> and `bms_channel_point`.`channel_code` like concat('%',#{query.channelCode},'%') </if>
             <if test="query.pointCode != null and query.pointCode != ''"> and `bms_channel_point`.`point_code` like concat('%',#{query.pointCode},'%') </if>
             <if test="query.pointName != null and query.pointName != ''"> and `bms_channel_point`.`point_name` like concat('%',#{query.pointName},'%') </if>
             <if test="query.shopArea != null and query.shopArea != ''"> and `bms_channel_point`.`shop_area` = #{query.shopArea}</if>