fix: 修复合并核销状态一次；fix：修复订单的空指针异常

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());

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);

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;
 
 }

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 {

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());

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());