From 85125295c150c78d6f02bb2be3c2e0d133540e05 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 23 十月 2024 11:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 558be70..7f8b25f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -153,7 +153,9 @@
                         discount = discount.add(tActivityStatisticslVO.getVipDiscountAmount());
                         stringBuilder1.append("会员抵扣").append("+");
                     }
-                    stringBuilder1.deleteCharAt(stringBuilder1.length()-1);
+                    if (stringBuilder1.length()>0){
+                        stringBuilder1.deleteCharAt(stringBuilder1.length()-1);
+                    }
                     tActivityStatisticslVO.setType(stringBuilder1.toString());
                     tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
                     break;

--
Gitblit v1.7.1