From 6372c0781bc0ee2aefae4634f556c33691fa505d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 10:16:53 +0800
Subject: [PATCH] add:默认保存普通会员
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 9 +++++++--
1 files changed, 7 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 8cca07c..f0a98e9 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();
}
}
@@ -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