From 00a44f7ead7d9a3b95ea881d8780a23f88cd370f Mon Sep 17 00:00:00 2001
From: qjq <1766193529@qq.com>
Date: Mon, 18 Nov 2024 09:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E7=A5=A8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/member/enums/ErrorCodeConstants.java     |  1 +
 .../member/service/billing/BillingServiceImpl.java  | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
index f9dac0fe..c2f544b3 100644
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@@ -151,5 +151,6 @@ public interface ErrorCodeConstants {
 
     ErrorCode BILLING_NOT_EXISTS = new ErrorCode(1_004_023_00, "开票记录不存在");
     ErrorCode BILLING_NOT_ORDER_EXISTS= new ErrorCode(1_004_023_00, "该时间段没有订单可开票");
+    ErrorCode BILLING_NOT_ORDER_REFUSE= new ErrorCode(1_004_024_00, "拒绝理由不能为空");
 }
 
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
index a988cbc6..bd0b7e18 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/billing/BillingServiceImpl.java
@@ -51,8 +51,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.BILLING_NOT_EXISTS;
-import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.BILLING_NOT_ORDER_EXISTS;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
 
 /**
  * 开票记录 Service 实现类
@@ -206,9 +205,13 @@ public class BillingServiceImpl implements BillingService {
     @Override
     public void updateBilling(BillingSaveReqVO updateReqVO) {
         // 校验存在
-        validateBillingExists(updateReqVO.getId());
+        BillingDO billingDO = billingMapper.selectById(updateReqVO.getId());
+        if (billingDO== null) {
+            throw exception(BILLING_NOT_EXISTS);
+        }
         // 更新
         BillingDO updateObj = BeanUtils.toBean(updateReqVO, BillingDO.class);
+        updateObj.setOrderId(billingDO.getOrderId());
         //开票成功是根据pdf上传成功没
         if(StrUtil.isNotBlank(updateObj.getPdfUrl())){
             //上传成功 修改状态
@@ -217,7 +220,9 @@ public class BillingServiceImpl implements BillingService {
             updateObj.setSystemId(SecurityFrameworkUtils.getLoginUserId());
         }else{
             //开票回拒
-            Assert.notNull(updateObj.getRefuseDetails(),"拒绝理由不能为空");
+            if(StrUtil.isBlank(updateObj.getRefuseDetails())){
+                throw exception(BILLING_NOT_ORDER_REFUSE);
+            }
             updateObj.setStatus(BillingStatusEnum.BILLING_INVOICING_REJECTION.getCode());
             updateObj.setRefuseTime(LocalDateTime.now());
             String orderId = updateObj.getOrderId();