From 0f2f06f922e6af30855eb43b26f0f1a8c022030b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 08 九月 2024 20:44:40 +0800
Subject: [PATCH] 一次加价 null
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 8cca07c..8cce311 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -598,6 +598,9 @@
int otherNum = 0;
if(cLs != null && cLs.size() > 0){
for(OrderItemCheck c : cLs){
+ if(Constants.CHECK_AUDIT_STATUS.REJECTED.name().equals(c.getAuditStatus())){
+ continue;
+ }
otherNum += c.getNum();
}
}
@@ -609,13 +612,13 @@
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()));
+ deduct = oi.getRealPrice().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()));
+ BigDecimal dt = oi.getRealPrice().multiply(new BigDecimal(dto.getNum()));
if(deduct.doubleValue() > dt.doubleValue()){
throw new ValidationException("降级金额不能大于商品处理数量金额");
}
@@ -626,8 +629,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());
@@ -635,6 +638,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