From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑,使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义,确保数据展示正确 - 更新 buyVipList.html 中状态颜色,以更直观地显示不同状态

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallInvoiceServiceImpl.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallInvoiceServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallInvoiceServiceImpl.java
index ae2b541..492f7de 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallInvoiceServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallInvoiceServiceImpl.java
@@ -162,6 +162,10 @@
     @Transactional
     public FebsResponse updateOrderDetail(Long id) {
         MallInvoice mallInvoice = this.baseMapper.selectById(id);
+
+        if(ObjectUtil.isEmpty(mallInvoice.getFapiaoApplyId())){
+            return new FebsResponse().fail().message("订单的支付方式不是微信支付。");
+        }
         String fapiaoApplyId = mallInvoice.getFapiaoApplyId();
         MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectBypayOrderNo(fapiaoApplyId);
         if(OrderStatusEnum.FINISH.getValue() != mallOrderInfo.getStatus()){

--
Gitblit v1.9.1