From dd92e5f816f30afc2682c4723bcdf6864135fd59 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 7 Aug 2024 11:33:26 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=94=AF=E4=BB=98=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tbs/mapper/TbsActivityPayConditionMapper.java | 15 +++++++++++++++
 .../vtb/service/impl/VtbFundFlowServiceImpl.java  | 15 ++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityPayConditionMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityPayConditionMapper.java
index 33ad7dcc..45d347a9 100644
--- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityPayConditionMapper.java
+++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivityPayConditionMapper.java
@@ -16,6 +16,21 @@ import java.util.List;
  */
 public interface TbsActivityPayConditionMapper extends BaseMapper<TbsActivityPayCondition> {
 
+    /**
+     * 统计所有的支付次数
+     * @param activityId
+     * @return
+     */
+    @Select("select sum(pay_times) from tbs_activity_pay_condition where del_flag = 0 and activity_id = #{activityId}")
+    Long sumActivityPayTimes(@Param("activityId") Long activityId);
+
+    /**
+     * 统计完成的核销数量
+     * @param activityId
+     * @return
+     */
+    @Select("select sum(id) from vtb_verification where del_flag = 0 and activity_id = #{activityId} and verification_state = '1' ")
+    Long sumFinishedCheck(@Param("activityId") Long activityId);
 
     @InterceptorIgnore(tenantLine = "1")
     @Select("select     " +
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
index 08935fe3..8ed825ac 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
@@ -171,11 +171,16 @@ public class VtbFundFlowServiceImpl extends ServiceImpl<VtbFundFlowMapper,VtbFun
             if(costApply!=null){
                 if(costApply.getContractFlag()!=null&&costApply.getContractFlag().equals(1)){
                     //判断是否满足所有协议
-                    LambdaQueryWrapper<TbsActivityPayCondition> conLqw = new LambdaQueryWrapper<>();
-                    conLqw.eq(TbsActivityPayCondition::getActivityId,activity.getId());
-                    conLqw.eq(TbsActivityPayCondition::getFinishedFlag,0);
-                    long count = activityPayConditionMapper.selectCount(conLqw);
-                    if(count<1){
+                    Long countPayTimes = activityPayConditionMapper.sumActivityPayTimes(activity.getId());
+                    Long countCheckItems = activityPayConditionMapper.sumFinishedCheck(activity.getId());
+                    if(countCheckItems==null){
+                        countCheckItems = 0L;
+                    }
+                    if(countPayTimes==null){
+                        log.warn("错误数据，支付条件统计异常 actId:{}",activity.getId());
+                        countPayTimes = 0L;
+                    }
+                    if(countPayTimes <= countCheckItems){
                         activity.setActivityState(TbsActivityState.STATE_1_Finished);
                     }
                 }