diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IProductOrderService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IProductOrderService.java index 915ff7d..b0b3e86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IProductOrderService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IProductOrderService.java @@ -11,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.Collection; +import java.util.Date; import java.util.List; /** @@ -201,4 +202,5 @@ public interface IProductOrderService { void refundFailToFinish(); + void updateConsigneeTimeById(Date date, Long productOrderId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/OrderDeliveryService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/OrderDeliveryService.java index 6820cb1..1050a59 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/OrderDeliveryService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/OrderDeliveryService.java @@ -14,10 +14,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; +import java.util.*; @Service @RequiredArgsConstructor @@ -214,6 +211,7 @@ public class OrderDeliveryService { deliveryOrderVo.setDispatcherName(deliveryStatusCallback.getDispatcherName()); deliveryOrderVo.setDispatcherMobile(deliveryStatusCallback.getDispatcherPhone()); productOrderService.updateStatusByOrderId("2", deliveryOrderVo.getOrderId()); + productOrderService.updateConsigneeTimeById(new Date(), deliveryOrderVo.getOrderId()); } case ("14") -> { deliveryOrderVo.setDispatcherName(deliveryStatusCallback.getDispatcherName()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/api/ProductOrderExpressApi.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/api/ProductOrderExpressApi.java index 6d69be1..c254fbb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/api/ProductOrderExpressApi.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/api/ProductOrderExpressApi.java @@ -638,6 +638,9 @@ public class ProductOrderExpressApi { productOrderExpressVo.setStatus("4"); baseService.updateByVo(productOrderExpressVo); + }else if(status == 10){ + Long productOrderId = productOrderExpressVo.getOrderId(); + productOrderService.updateConsigneeTimeById(new Date(), productOrderId); } baseService.updateByVo(productOrderExpressVo); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java index b5e8036..c6b74b6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java @@ -1095,6 +1095,14 @@ public class ProductOrderServiceImpl implements IProductOrderService { } } + @Override + public void updateConsigneeTimeById(Date date, Long id) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(ProductOrder::getId, id); + updateWrapper.set(ProductOrder::getConsigneeTime, date); + baseMapper.update(updateWrapper); + + } private ProductOrderVo insertOrderByVo(ProductOrderVo vo) {