From b27420f3e0cbb0de34c34ddd308dd4baf7d4b225 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 10 九月 2024 08:29:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index aa64ad8..986d187 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -180,7 +180,7 @@
cartMapper.insert(c);
} else {
- c.setNum(c.getNum() + dto.getNum());
+ c.setNum((c.getNum()==null?0:c.getNum()) + dto.getNum());
c.update(userId);
if (c.getNum() <= 0) {
cartMapper.deleteById(c.getId());
--
Gitblit v1.9.3