From 6ecf246fdb0b3afd3872b11d5c7ce1d84884be2e Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期三, 28 八月 2024 18:10:12 +0800
Subject: [PATCH] 确认配送单是否质检
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 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 3c8e8ff..74354c9 100644
--- a/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java
@@ -171,25 +171,6 @@
if(ls != null && ls.size() > 0){
for(DeliveryOrderItemSettlementDTO dto : ls){
dto.setTotalAmount(dto.getPrice().multiply(new BigDecimal(dto.getNum())));
-
- if(StringUtils.isNotEmpty(dto.getStatus())) {
- Double rate = dto.getServiceFeeRate();
- BigDecimal serviceFee = new BigDecimal(0);
- if(rate != null) {
- serviceFee = dto.getTotalAmount().multiply(new BigDecimal(rate))
- .divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
- dto.setServiceFee(serviceFee);
- }
-
- BigDecimal income = dto.getTotalAmount().subtract(dto.getCheckFee())
- .subtract(dto.getSalesFee()).subtract(dto.getStationFee())
- .subtract(serviceFee);//结算金额
- if (income.doubleValue() < 0) {
- income = new BigDecimal(0);
- }
-
- dto.setIncome(income);
- }
}
}
@@ -665,6 +646,19 @@
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);
+ }
+ }
}
public void deleteCheckInfo(String itemId, String type){
--
Gitblit v1.9.3