From ebe5f50a0a0ba9a381843f9fdc3c325979fb66ca Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 13:29:17 +0800
Subject: [PATCH] 合伙人 打印
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 4 +++-
1 files changed, 3 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..75a5177 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());
@@ -444,6 +444,7 @@
BigDecimal totalAmount = order.getFlowerAmount().add(p.getPacking()).add(transportFee);//使用优惠券之前的总价
CouponRecordDO coupon = useCouponRecord(order.getId(), totalAmount, dto.getCouponRecordId());
+ log.info("用户优惠券: " + coupon);
if(coupon != null){
order.setMemberCouponId(coupon.getId());
order.setMemberCouponCode(coupon.getCouponCode());
@@ -563,6 +564,7 @@
}
private CouponRecordDO useCouponRecord(String orderId, BigDecimal amount, String couponRecordId){
+ log.info("使用用户优惠券id: " + couponRecordId + "; 订单id: " + orderId);
if(StringUtils.isNotEmpty(couponRecordId)){
//优惠券使用和验证，如果不符合使用条件需要抛出异常。需调用优惠券使用方法
couponRecordService.useCoupon(couponRecordId, orderId, amount);
--
Gitblit v1.9.3