From 4f576ae7c923e78af9bb0f88c2f4508e0890ef93 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 06 九月 2024 16:28:32 +0800
Subject: [PATCH] 质检重新提交验证
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 944ca71..2d2bf80 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -591,6 +591,20 @@
throw new ValidationException("处理数量不能大于商品数量");
}
+ List<OrderItemCheck> cLs = orderItemCheckMapper.selectList(new QueryWrapper<OrderItemCheck>()
+ .ne("type", dto.getType())
+ .eq("order_item_id", dto.getOrderItemId())
+ );
+ int otherNum = 0;
+ if(cLs != null && cLs.size() > 0){
+ for(OrderItemCheck c : cLs){
+ otherNum += c.getNum();
+ }
+ }
+ if(otherNum + dto.getNum() > oi.getNum()){
+ throw new ValidationException("处理总数量不能大于商品数量");
+ }
+
BigDecimal deduct = new BigDecimal(0);
if(Constants.CHECK_TYPE.replace.name().equals(dto.getType())){
deduct = oi.getSupplierPrice().multiply(new BigDecimal(dto.getNum()));
@@ -612,8 +626,8 @@
.eq("order_item_id", dto.getOrderItemId())
);
if(c != null){
- if(StringUtils.isNotEmpty(c.getAuditStatus())){
- throw new ValidationException("已审核，不可修改");
+ if(Constants.CHECK_AUDIT_STATUS.AGREED.name().equals(c.getAuditStatus())){
+ throw new ValidationException("已审核通过，不可修改");
}
c.setCheckTime(LocalDateTime.now());
c.setNum(dto.getNum());
@@ -621,6 +635,8 @@
c.setPictures(toJSONString(pictureList));
c.setTargetLevel(targetLevel);
c.setDeductAmount(deduct);
+ c.setAuditStatus(null);
+ c.setAuditTime(null);
c.update(SecurityUtils.getUserId());
orderItemCheckMapper.updateById(c);
} else {
--
Gitblit v1.9.3