From 11ae35ee35a5a366d05a54513ae360fccc2b7b5a Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 21 Dec 2023 11:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qs/serve/common/config/MyBatisConfig.java |  3 ++-
 .../controller/VtbVerificationController.java | 26 ++++++++++++++++++-
 .../vtb/service/VtbVerificationService.java   |  2 ++
 .../impl/VtbVerificationServiceImpl.java      | 15 ++++++++---
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/common/config/MyBatisConfig.java b/src/main/java/com/qs/serve/common/config/MyBatisConfig.java
index deebb82e..453b0bf7 100644
--- a/src/main/java/com/qs/serve/common/config/MyBatisConfig.java
+++ b/src/main/java/com/qs/serve/common/config/MyBatisConfig.java
@@ -45,7 +45,8 @@ public class MyBatisConfig {
                 "sys_tenant",
                 "wx_app",
                 "sys_menu",
-                "sys_menu_permit"
+                "sys_menu_permit",
+                "sys_request_log"
         };
         SysTenantHandler sysTenantHandler = new SysTenantHandler(ignoreTable);
         return new TenantLineInnerInterceptor(sysTenantHandler);
diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
index 5384d63b..90d4807c 100644
--- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
+++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
@@ -454,7 +454,31 @@ public class VtbVerificationController {
      */
     @GetMapping("successCommit")
     public R<?> successCommit(Long verificationId){
-        vtbVerificationService.successCommit(verificationId);
+        vtbVerificationService.successCommit(verificationId,false);
+        return R.ok();
+    }
+
+
+    /**
+     * 成功提交回调
+     * @return
+     */
+    //@GetMapping("successCommit2")
+    public R<?> successCommit2(){
+        //错误的
+        Long[] costIds = new Long[]{
+                264884L,
+                22010L
+        };
+        List<Long> costIds2 = Arrays.asList(costIds);
+
+        LambdaQueryWrapper<VtbVerification> lqw = new LambdaQueryWrapper<>();
+        lqw.in(VtbVerification::getCostApplyId,costIds2);
+        lqw.select(VtbVerification::getId);
+        List<VtbVerification> vtbVerificationList = vtbVerificationService.list(lqw);
+        for (VtbVerification verification : vtbVerificationList) {
+            vtbVerificationService.successCommit(verification.getId(),false);
+        }
         return R.ok();
     }
 
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
index 6316d951..5ec84a12 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
@@ -76,6 +76,8 @@ public interface VtbVerificationService extends IService<VtbVerification> {
      */
     void successCommit(Long verificationId);
 
+    void successCommit(Long verificationId,boolean toPay);
+
     /**
      * 检测释放正在核销
      * @param activityId
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 133f3396..ebb7b017 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
@@ -1144,8 +1144,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void successCommit(Long verificationId) {
+    public void successCommit(Long verificationId, boolean toPay) {
         log.info("活动核销提交成功。verificationId：{}",verificationId);
         VtbVerification verification = this.getById(verificationId);
         boolean checkZero = verification.getAmount().compareTo(BigDecimal.ZERO)==0;
@@ -1184,6 +1183,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             Long subjectId = verificationSubject.getSubjectId();
             BigDecimal usedAmount = verificationSubject.getUsedAmount();
             List<TbsActivityCenterGoods> activityCenterGoodsOfSubject = centerGoodsMapBySubject.get(subjectId);
+            if(!toPay&&activityCenterGoodsOfSubject==null){
+                log.warn("活动核销档案有异常。verificationId：{}",verificationId);
+                return;
+            }
             Map<String,List<TbsActivityCenterGoods>> activityGoodsOfSubjectCenter = activityCenterGoodsOfSubject.stream()
                     .collect(Collectors.groupingBy(obj->obj.getCenterType()+":"+obj.getCenterId()));
 
@@ -1225,7 +1228,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             supplier.setCode(activity.getSupplierCode());
             supplier.setName(activity.getSupplierName());
             //协议类的核销，不需要调用支付接口
-            if(!costApply.getContractFlag().equals(1)){
+            if(!costApply.getContractFlag().equals(1)&&toPay){
+                log.warn("核销去支付：{}",verification.getVerificationCode());
                 String COST_TO_PAY_API = projectApisProperties.getCostToPay();
                 String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
                         , activity.getActTitle(),activity.getActStartDate().atStartOfDay(),activity.getActEndDate().atTime(23,59,59), verification);
@@ -1302,7 +1306,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             }
         }
         costApplyService.updateById(updCost);
+    }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void successCommit(Long verificationId) {
+        this.successCommit(verificationId,true);
     }
 
     /**