From ce48a76e4765e1f4e7cd46a58ce6e290991079e6 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Fri, 1 Dec 2023 10:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=A0=B8=E9=94=80=EF=BC=8Cdebug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tzc/controller/TzcPolicyController.java   |  1 +
 .../controller/VtbVerificationController.java | 11 ++++++
 .../impl/VtbVerificationServiceImpl.java      | 39 +------------------
 3 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
index 5bdbc296..2e97c1c2 100644
--- a/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
+++ b/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
@@ -467,6 +467,7 @@ public class TzcPolicyController {
         policy.setPolicyStatus(TzcPolicyStatus.Status_6_CANCEL);
         policy.setPassTime(LocalDateTime.now());
         tzcPolicyService.updateById(policy);
+        //TODO 远程修复OA的待审批列表 select * from tzc_policy where policy_status = 6 and `policy_code` in (
         return R.ok();
     }
 
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 58a04476..45218877 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
@@ -446,5 +446,16 @@ public class VtbVerificationController {
         return vtbVerificationOperationService.runCompensate(id);
     }
 
+    /**
+     * 成功提交回调
+     * @param verificationId
+     * @return
+     */
+    @GetMapping("successCommit")
+    public R<?> successCommit(Long verificationId){
+        vtbVerificationService.successCommit(verificationId);
+        return R.ok();
+    }
+
 }
 
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 bf02fda8..20d3346d 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
@@ -1196,7 +1196,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 .collect(Collectors.groupingBy(TbsActivityCenter::getSubjectId));
         List<VtbFundFlow> addFundFlowList = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
-        Date now2 = Date.from(now.atZone(ZoneId.systemDefault()).toInstant());
 
         for (VtbVerificationSubject verificationSubject : verificationSubjects) {
             Long subjectId = verificationSubject.getSubjectId();
@@ -1221,7 +1220,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                             currentCenterAmount = subjectCenter.getUsedAmount();
                         }
                     }
-                    buildFundFlows(verificationId, addFundFlowList, activityGoodsListOfSubjectCenter,currentCenterAmount);
                 }else {
                     //按比例分配
                     if(i == activityCenters.size()-1){
@@ -1232,9 +1230,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                                 .setScale(2, RoundingMode.DOWN);
                         preCenterAmount = preCenterAmount.add(currentCenterAmount);
                     }
-                    buildFundFlows(verificationId, addFundFlowList, activityGoodsListOfSubjectCenter,currentCenterAmount);
                 }
-
+                buildFundFlows(verificationId, addFundFlowList, activityGoodsListOfSubjectCenter,currentCenterAmount);
             }
 
             //调用支付接口
@@ -1253,39 +1250,6 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
                 syncLog.setTodoState(1);
                 sysSyncLogService.save(syncLog);
             }
-
-
-//            //发送请求到中间服务
-//            XltApticlaim apticlaim = new XltApticlaim();
-//            apticlaim.setVerificationCode(verificationSubject.getVerificationSubCode());
-//            apticlaim.setCostCode(verificationSubject.getVerificationSubCode());
-//            apticlaim.setCostCode2(verificationSubject.getVerificationSubCode());
-//            apticlaim.setCusCode(verificationSubject.getSupplierCode());
-//            apticlaim.setAmount(verificationSubject.getUsedAmount());
-//            apticlaim.setSubjectCode(verificationSubject.getSubjectCode());
-//            apticlaim.setSubjectName(verificationSubject.getSubjectName());
-//            apticlaim.setExpType("TI");
-//            apticlaim.setApplyType("01");
-//            apticlaim.setEffDate(now2);
-//            apticlaim.setInvoiced("2");
-//            apticlaim.setCreateTime(now2);
-//            apticlaim.setDealTime(now2);
-//            apticlaim.setTopic(costApply.getChargeTheme());
-//
-//            //设置默认字段
-//            apticlaim.setStatus("00");
-//            apticlaim.setApticlaimAmtTax(BigDecimal.ZERO);
-//            apticlaim.setApticlaimVat("0");
-//            apticlaim.setApticlaimInvoice("");
-//
-//            try {
-//                //todo 如果失败做补偿处理
-//                xiaoLuTonService.saveApticlaim(apticlaim);
-//                log.info("发送对象(apticlaim)到OA服务成功");
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//                log.error("发送对象到OA服务失败,数据内容如下：{}",JsonUtil.objectToJson(apticlaim));
-//            }
         }
 
 
@@ -1296,6 +1260,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         subjectLqw.eq(VtbVerificationSubject::getVerificationId,verificationId);
         VtbVerificationSubject subjectParam = new VtbVerificationSubject();
         subjectParam.setEffectiveFlag(1);
+        //fundFlowService.flushActivityAmount() 必须把FundFlow操作前置
         //更新已用费用记录，并更新活动状态是否完成（旧流程按比例分配，新流程按比例分配后，进行再分配）
         fundFlowService.flushActivityAmount(verification.getActivityId());
         verificationSubjectService.update(subjectParam,subjectLqw);