From e0ea1f4a21321f145be79556896181f23f22b708 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 29 八月 2024 09:33:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master-v2
---
src/main/java/com/mzl/flower/service/payment/DeliveryOrderService.java | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 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..41ad60b 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);
- }
}
}
@@ -604,24 +585,35 @@
if(dto.getNum() == null || dto.getNum() == 0){
throw new ValidationException("处理数量不能为0");
}
- OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
- .eq("type", dto.getType())
- .eq("order_item_id", dto.getOrderItemId())
- );
+
OrderItem oi = orderItemMapper.selectById(dto.getOrderItemId());
if(dto.getNum() > oi.getNum()){
throw new ValidationException("处理数量不能大于商品数量");
}
- BigDecimal deduct = deductAmount;
- if(deduct == null){
- deduct = new BigDecimal(0);
- 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()));
+
+ BigDecimal deduct = new BigDecimal(0);
+ 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()));
+ } else if (Constants.CHECK_TYPE.reduce.name().equals(dto.getType())) {
+ if(deductAmount == null){
+ throw new ValidationException("降级金额不能为空");
+ }
+ deduct = deductAmount.multiply(new BigDecimal(dto.getNum()));
+ if(deduct.doubleValue() > oi.getTotal().doubleValue()){
+ throw new ValidationException("降级金额不能大于商品总金额");
}
}
+
+ OrderItemCheck c = orderItemCheckMapper.selectOne(new QueryWrapper<OrderItemCheck>()
+ .eq("type", dto.getType())
+ .eq("order_item_id", dto.getOrderItemId())
+ );
if(c != null){
+ if(StringUtils.isNotEmpty(c.getAuditStatus())){
+ throw new ValidationException("已审核，不可修改");
+ }
c.setCheckTime(LocalDateTime.now());
c.setNum(dto.getNum());
c.setRemarks(dto.getRemarks());
@@ -665,6 +657,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