From 09d995ef260339a37c128876dd4f0a813cdc0163 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 3 Jul 2023 14:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/loansolutions/LoanSolutionsService.java           | 4 +++-
 .../scm/biz/scmapplyinbound/ScmApplyInboundService.java   | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index 4a1cbaffa9..385890876e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -84,7 +84,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if(appOrderPriceInfoVo != null){
                 solutionsDetailsVo.setFinalPrice(appOrderPriceInfoVo.getTransactionPrice());
                 solutionsDetailsVo.setGcPrice(appOrderPriceInfoVo.getGcPrice());
-                solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+                if(StringUtils.isNotBlank(appOrderPriceInfoVo.getSzPrice())){
+                    solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+                }
             }
         }
         if (loanSolutions == null) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index b6253c997a..3e358b2a0e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -978,7 +978,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if ("已办结".equals(scmApplyInbound.getNodeState())) {
             return rb.setMsg("该数据已审批通过，不允许终止");
         }
-        if (StringUtils.isNotBlank(scmApplyInbound.getTaskId())) {
+      /*  if (StringUtils.isNotBlank(scmApplyInbound.getTaskId())) {
             com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
             flowTaskVo.setTaskId(scmApplyInbound.getTaskId());
             flowTaskVo.setInstanceId(scmApplyInbound.getProcInsId());
@@ -997,7 +997,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             scmApplyInbound.setTaskDefKey("Event_end");
             scmApplyInbound.setCancalRemarks(cancalRemarks);
             baseMapper.updateById(scmApplyInbound);
-        }
+        }*/
+        scmApplyInbound.setNodeState("终止");
+        scmApplyInbound.setTaskDefKey("Event_end");
+        scmApplyInbound.setCancalRemarks(cancalRemarks);
+        baseMapper.updateById(scmApplyInbound);
         return rb.success();
     }