From 84f1e606d3cdd3733b0e92927bd46bf60ad93063 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 30 八月 2024 11:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
index 05cf7e7..944ca71 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -585,24 +585,36 @@
if(dto.getNum() == null || dto.getNum() == 0){
throw new ValidationException("处理数量不能为0");
}
- OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
- .eq("type", dto.getType())
- .eq("order_item_id", dto.getOrderItemId())
- );
+
OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId());
if(dto.getNum() > oi.getNum()){
throw new ValidationException("处理数量不能大于商品数量");
}
- BigDecimal deduct = deductAmount;
- if(deduct == null){
- deduct = new BigDecimal(0);
- if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
- deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
- } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
- deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+
+ BigDecimal deduct = new BigDecimal(0);
+ if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
+ deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
+ } else if(Constants.CHECK_TYPE.lack.name().equals(dto.getType())){
+ deduct = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+ } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) {
+ if(deductAmount == null){
+ throw new ValidationException("降级金额不能为空");
+ }
+ deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
+ BigDecimal dt = oi.getPrice().multiply(new BigDecimal(dto.getNum()));
+ if(deduct.doubleValue() > dt.doubleValue()){
+ throw new ValidationException("降级金额不能大于商品处理数量金额");
}
}
+
+ OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
+ .eq("type", dto.getType())
+ .eq("order_item_id", dto.getOrderItemId())
+ );
if(c != null){
+ if(StringUtils.isNotEmpty(c.getAuditStatus())){
+ throw new ValidationException("已审核，不可修改");
+ }
c.setCheckTime(LocalDateTime.now());
c.setNum(dto.getNum());
c.setRemarks(dto.getRemarks());
@@ -628,7 +640,7 @@
}
}
- public void checkOrderItemStatus(String id){
+ public String checkOrderItemStatus(String id){
OrderItem oi = orderItemMapper.selectById(id);
List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
.eq("order_item_id", id)
@@ -646,6 +658,21 @@
oi.update(SecurityUtils.getUserId());
orderItemMapper.updateById(oi);
}
+
+ DeliveryOrderItem di = deliveryOrderItemMapper.selectOne(new QueryWrapper<DeliveryOrderItem>()
+ .eq("order_item_id", id));
+ if(di != null) {
+ Integer count = deliveryOrderItemMapper.getUnCheckCount(di.getDeliveryId());
+ if(count == 0) {
+ DeliveryOrder d = deliveryOrderMapper.selectById(di.getDeliveryId());
+ d.setCheckTime(LocalDateTime.now());
+ d.setStatus(Constants.DELIVERY_ORDER_STATUS.CHECKED.name());
+ d.update(SecurityUtils.getUserId());
+ deliveryOrderMapper.updateById(d);
+ }
+ }
+
+ return oi.getOrderId();
}
public void deleteCheckInfo(String itemId, String type){
--
Gitblit v1.9.3