From 9e710473223b9cb94d1da9d58499671bffc1863d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 19 九月 2024 15:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 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 54dd68e..0efa99d 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -16,6 +16,7 @@
import com.mzl.flower.dto.request.payment.*;
import com.mzl.flower.dto.response.flower.FlowerCartListDTO;
import com.mzl.flower.dto.response.flower.FlowerCartListWrapDTO;
+import com.mzl.flower.dto.response.flower.FlowerDTO;
import com.mzl.flower.dto.response.flower.ParamItemDTO;
import com.mzl.flower.dto.response.partner.PartnerOrderDTO;
import com.mzl.flower.dto.response.payment.*;
@@ -25,6 +26,7 @@
import com.mzl.flower.entity.coupon.CouponRecordDO;
import com.mzl.flower.entity.customer.Address;
import com.mzl.flower.entity.customer.Customer;
+import com.mzl.flower.entity.flower.Flower;
import com.mzl.flower.entity.flower.FlowerSupplierSaleNum;
import com.mzl.flower.entity.menber.Member;
import com.mzl.flower.entity.partner.Partner;
@@ -158,6 +160,7 @@
@Autowired
private CouponRecordService couponRecordService;
+
public void changeFlower2Cart(CartSaveDTO dto) {
String userId = SecurityUtils.getUserId();
String key = userId + "_" + dto.getId();
@@ -180,7 +183,23 @@
cartMapper.insert(c);
} else {
+ // 查看是否已经超过当前商品的限购数量
+ final FlowerDTO flowerDetail = flowerService.getFlowerDetail(c.getFlowerId());
c.setNum((c.getNum()==null?0:c.getNum()) + dto.getNum());
+
+ // 限购 1.首先查看购物车中的数量是否已经超过限售数量
+ 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(tmp.compareTo(flowerDetail.getLimited())>0){
+ throw new ValidationException("当天的订单的花数量加上购物车的数量不能超过限售数量！");
+ }
+
c.update(userId);
if (c.getNum() <= 0) {
cartMapper.deleteById(c.getId());
@@ -298,6 +317,8 @@
}
public PreOrderDTO getPreOrderInfo(List<CartSaveDTO> flowers, Map<Long, PriceDTO> priceMap) {
+ String userId = SecurityUtils.getUserId();
+
if (flowers == null || flowers.size() == 0) {
throw new ValidationException("请选择商品");
}
@@ -313,6 +334,18 @@
}
idNumMap.put(id, num);
}
+
+ // 限购数量校验 鲜花数量校验
+ flowers.forEach(cartSaveDTO -> {
+ // 限购数量 鲜花数量校验
+ Integer completeNumToday=getFlowerCompleteNumToday(userId,cartSaveDTO.getId());
+ Integer tmp=completeNumToday+cartSaveDTO.getNum();
+ Flower flower=flowerMapper.selectById(cartSaveDTO.getId());
+ if(tmp.compareTo(flower.getLimited())>0){
+ throw new ValidationException("商品:'"+flower.getName()+"' 昨天17:00到今天17:00 超过限售数量："+flower.getLimited()+"！");
+ }
+ });
+
PreOrderDTO result = new PreOrderDTO();
List<FlowerCartListDTO> ls = flowerMapper.selectFlowerOrderList(ids);
@@ -395,6 +428,16 @@
}
public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) {
+ String userId = SecurityUtils.getUserId();
+ p.getFlowers().forEach(flower -> {
+ // 限购数量 鲜花数量校验
+ Integer completeNumToday=getFlowerCompleteNumToday(userId,flower.getId());
+ Integer tmp=completeNumToday+flower.getNum();
+ if(tmp.compareTo(flower.getLimited())>0){
+ throw new ValidationException("商品:'"+flower.getName()+"' 昨天17:00到今天17:00 超过限售数量："+flower.getLimited()+"！");
+ }
+ });
+
WxMaJscode2SessionResult session = null;
try {
session = weChatService.getWxMaSessionInfo(dto.getWxcode());
@@ -417,7 +460,7 @@
deliveryName = d.getName();
}
- String userId = SecurityUtils.getUserId();
+
Order order = new Order();
order.setId(UUIDGenerator.getUUID());
@@ -485,6 +528,7 @@
BigDecimal usedCouponAmount = new BigDecimal(0);
for (int i = 0; i < flowers.size(); i++) {
FlowerCartListDTO f = flowers.get(i);
+
OrderItem t = new OrderItem();
t.setId(UUIDGenerator.getUUID());
t.setOrderId(order.getId());
@@ -1501,4 +1545,9 @@
Order o = orderMapper.getUserLastOrder(userId);
return o.getReceiveTime();
}
+
+ public Integer getFlowerCompleteNumToday(String userId,Long flowerId){
+ Integer completeNum= orderMapper.getFlowerCompleteNumToday(userId,flowerId);
+ return completeNum;
+ }
}
--
Gitblit v1.9.3