From 328d3f917bfbd9ab4e189b93a8c670b810b126dd Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Thu, 11 Jul 2024 11:20:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E7=8A=B6=E6=80=81=E4=B8=80=E6=AC=A1=EF=BC=9B?=
 =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/controller/OmsOrderController.java     |  1 +
 .../controller/VtbVerificationController.java  |  8 ++++++--
 .../vtb/entity/bo/VtbVerificationBo.java       |  2 +-
 ...bVerificationBatchOperationServiceImpl.java |  1 +
 .../impl/VtbVerificationBatchServiceImpl.java  |  2 ++
 .../impl/VtbVerificationServiceImpl.java       | 18 ++++++++++--------
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java
index b3e19a99..078679ab 100644
--- a/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java
+++ b/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java
@@ -75,6 +75,7 @@ public class OmsOrderController {
         List<BmsSupplierAddress> supplierAddressList = bmsSupplierAddressService.listByIds(addrIds);
 
         Set<String> userIds = list.stream().map(OmsOrder::getCheckUserId).collect(Collectors.toSet());
+        userIds.add("0");
         List<SysUser> userList = sysUserService.listByIds(userIds);
 
         Set<Long> orderIds = list.stream().map(OmsOrder::getId).collect(Collectors.toSet());
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 0ec6a1fa..abc36e07 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
@@ -193,8 +193,12 @@ public class VtbVerificationController {
     public R<VtbVerification> getById(@PathVariable("id") String id){
         VtbVerification vtbVerification = vtbVerificationService.getById(id);
         if(vtbVerification.getVerificationState().equals(VtbVerificationState.Commiting.getCode())){
-            vtbVerificationOperationService.runCompensate(id);
-            vtbVerification = vtbVerificationService.getById(id);
+            try {
+                vtbVerificationOperationService.runCompensate(id);
+                vtbVerification = vtbVerificationService.getById(id);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         vtbVerificationApplication2.buildRelateInfo(vtbVerification);
         return R.ok(vtbVerification);
diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java
index ec5c50db..9c98ba65 100644
--- a/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java
+++ b/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java
@@ -60,7 +60,7 @@ public class VtbVerificationBo implements Serializable {
     /** 原来的审批id */
     private Long orgVerificationId;
 
-    /** 是否释放 */
+    /** 是否释放(这个值取反 0-表示释放；1-表示不释放) */
     private Integer inputReleaseFlag;
 
 }
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
index 4c3b82a1..ede84920 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
@@ -406,6 +406,7 @@ public class VtbVerificationBatchOperationServiceImpl implements VtbVerification
                 if(isFinish){
                     verificationApplication.finishCallBack(verification, totalAmount);
                     if(isRelease){
+                        log.warn("核销"+verification.getVerificationCode()+"释放金额");
                         vtbVerificationService.release(verification.getActivityId(),sysUser.getCode(),false);
                     }
                 }else {
diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
index 3af517aa..771b0632 100644
--- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
+++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
@@ -462,8 +462,10 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl<VtbVerification
         verification.setCostApplyId(costApply.getId());
         verification.setActivityId(verificationBo.getActivityId());
         verification.setAttachIds(verificationBo.getAttachIds());
+        //这里的值取反(仅记录用于前端显示)
         verification.setInputReleaseFlag(verificationBo.getInputReleaseFlag());
         if(verificationBo.getInputReleaseFlag()!=null&& verificationBo.getInputReleaseFlag().equals(0)){
+            //初始化是否要释放金额（InputReleaseFlag=0时代表是否）
             verification.setRegReleaseFlag(1);
         }
         verification.setSupplierId(activity.getSupplierId());
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 20580a8b..9c117f08 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
@@ -1391,8 +1391,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             BmsSupplier supplier = new BmsSupplier();
             supplier.setCode(activity.getSupplierCode());
             supplier.setName(activity.getSupplierName());
+            //测试单号
+            boolean isDevData = verification.getVerificationCode().contains("TEST");
             //协议类的核销，不需要调用支付接口
-            if(!costApply.getContractFlag().equals(1)&&toPay){
+            if(!costApply.getContractFlag().equals(1)
+                    && toPay
+                    && !isDevData){
                 log.warn("核销去支付：{}",verification.getVerificationCode());
                 String COST_TO_PAY_API = projectApisProperties.getCostToPay();
                 String json = ThirtyVerificationUtil.buildJson(supplier, subject, verification.getAmount()
@@ -1428,14 +1432,12 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
             activityUpdate.setId(verification.getActivityId());
             activityService.updateById(activityUpdate);
         }
-        //更新释放的核销（通过batchId区分旧版核销）
-        if(verification.getBatchId()!=null&&verification.getInputReleaseFlag()!=null&&verification.getInputReleaseFlag().equals(1)){
+        //更新释放的核销（通过batchId区分旧版的单核销,单核销在此方法外部有释放函数，只处理批量的核销释放）
+        if(verification.getBatchId()!=null
+                &&verification.getRegReleaseFlag()!=null
+                &&verification.getRegReleaseFlag().equals(1)){
             //更新活动状态
-            TbsActivity activityUpdate = new TbsActivity();
-            activityUpdate.setActivityState(TbsActivityState.STATE_4_Release);
-            activityUpdate.setReleaseTime(LocalDateTime.now());
-            activityUpdate.setId(verification.getActivityId());
-            activityService.updateById(activityUpdate);
+            this.release(verification.getActivityId(),"0",false);
         }
 
         BigDecimal totalCostApplyUsed = costApplyService.totalCostUsed(activity.getCostApplyId());