From 263a13a155ec759b1cb26cc00edd640f4d2e747c Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 19 九月 2024 16:46:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 0efa99d..0b26afb 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -181,6 +181,21 @@
c.setNum(dto.getNum());
c.create(userId);
+ // 限购 1.首先查看购物车中的数量是否已经超过限售数量
+ final FlowerDTO flowerDetail = flowerService.getFlowerDetail(c.getFlowerId());
+ if(null!=c.getNum() && null!=flowerDetail.getLimited()
+ && c.getNum().compareTo(flowerDetail.getLimited())>0){
+ throw new ValidationException("数量不能超过限售数量！");
+ }
+
+ // 限购 2.查看已结单的订单的当前花朵已经购买的数量，加当前购物车的加入的数量是否超过限购的数量，查看当前5点前到昨天五点前
+ Integer completeNumToday=getFlowerCompleteNumToday(userId,c.getFlowerId());
+ Integer tmp=completeNumToday+c.getNum();
+ if(null!=tmp && null!=flowerDetail.getLimited()
+ && tmp.compareTo(flowerDetail.getLimited())>0){
+ throw new ValidationException("当天的订单的花数量加上购物车的数量不能超过限售数量！");
+ }
+
cartMapper.insert(c);
} else {
// 查看是否已经超过当前商品的限购数量
@@ -196,7 +211,8 @@
// 限购 2.查看已结单的订单的当前花朵已经购买的数量，加当前购物车的加入的数量是否超过限购的数量，查看当前5点前到昨天五点前
Integer completeNumToday=getFlowerCompleteNumToday(userId,c.getFlowerId());
Integer tmp=completeNumToday+c.getNum();
- if(tmp.compareTo(flowerDetail.getLimited())>0){
+ if(null!=tmp && null!=flowerDetail.getLimited()
+ && tmp.compareTo(flowerDetail.getLimited())>0){
throw new ValidationException("当天的订单的花数量加上购物车的数量不能超过限售数量！");
}
@@ -341,7 +357,7 @@
Integer completeNumToday=getFlowerCompleteNumToday(userId,cartSaveDTO.getId());
Integer tmp=completeNumToday+cartSaveDTO.getNum();
Flower flower=flowerMapper.selectById(cartSaveDTO.getId());
- if(tmp.compareTo(flower.getLimited())>0){
+ if(null!=flower.getLimited() && tmp.compareTo(flower.getLimited())>0){
throw new ValidationException("商品:'"+flower.getName()+"' 昨天17:00到今天17:00 超过限售数量："+flower.getLimited()+"！");
}
});
@@ -433,7 +449,8 @@
// 限购数量 鲜花数量校验
Integer completeNumToday=getFlowerCompleteNumToday(userId,flower.getId());
Integer tmp=completeNumToday+flower.getNum();
- if(tmp.compareTo(flower.getLimited())>0){
+ if(null!=tmp && null!=flower.getLimited()
+ && tmp.compareTo(flower.getLimited())>0){
throw new ValidationException("商品:'"+flower.getName()+"' 昨天17:00到今天17:00 超过限售数量："+flower.getLimited()+"！");
}
});
--
Gitblit v1.9.3