From 1026d9c85e400a10d1a35bb0460d29bd19ec1289 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 25 九月 2024 12:13:12 +0800
Subject: [PATCH] 质检图片
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 b7727a5..f921a0d 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -631,6 +631,8 @@
User user = userMapper.selectById(c.getCreateBy());
dto.setCreateName(user.getNickName());
+ dto.setPictureList(parseArray(c.getPictures(), String.class));
+
if(Constants.CHECK_TYPE.lack.name().equals(c.getType()) && isSupplier){
OrderItem oi = orderItemMapper.selectById(itemId);
BigDecimal lackFeeSupplier = oi.getSupplierPrice().multiply(new BigDecimal(c.getNum()));
@@ -643,15 +645,19 @@
public void doReduceCheck(OrderItemCheckCommitReduceDTO dto){
dto.setType(Constants.CHECK_TYPE.reduce.name());
- doCheck(dto, dto.getPictureList(), dto.getTargetLevel(), dto.getDeductAmount());
+ doCheck(dto, dto.getTargetLevel(), dto.getDeductAmount());
}
- public void doCheck(OrderItemCheckCommitDTO dto
- , List<String> pictureList, String targetLevel, BigDecimal deductAmount) {
+ public void doCheck(OrderItemCheckCommitDTO dto, String targetLevel, BigDecimal deductAmount) {
if(dto.getNum() == null || dto.getNum() == 0){
throw new ValidationException("处理数量不能为0");
}
+ List<String> pictureList = dto.getPictureList();
+ if(pictureList == null || pictureList.size() == 0){
+ throw new ValidationException("质检图片不能为空");
+ }
+
OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId());
if(dto.getNum() > oi.getNum()){
throw new ValidationException("处理数量不能大于商品数量");
--
Gitblit v1.9.3