Merge branch 'master' of https://gitee.com/liu-jiangs-project/RuoYi-Vue

sql/ry_20240629.sql

@@ -2555,6 +2555,9 @@ CREATE TABLE `store_order_detail`
     KEY                        `idx_eid_ewno` (`express_id`,`express_waybill_no`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='代发订单明细';
 
+ALTER TABLE `store_order_detail`
+ADD COLUMN `delivery_over_time` datetime NULL COMMENT '发货完成时间' AFTER `refund_reject_reason`;
+
 DROP TABLE IF EXISTS `store_order_operation_record`;
 CREATE TABLE `store_order_operation_record`
 (

xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 代发订单明细
@@ -114,6 +115,10 @@ public class StoreOrderDetail extends SimpleEntity {
      * 退货拒绝原因
      */
     private String refundRejectReason;
+    /**
+     * 发货完成时间
+     */
+    private Date deliveryOverTime;
     /**
      * 版本号
      */

xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailDTO.java

@@ -113,6 +113,10 @@ public class StoreOrderDetailDTO {
      * 退货拒绝原因
      */
     private String refundRejectReason;
+    /**
+     * 发货完成时间
+     */
+    private Date deliveryOverTime;
     /**
      * 删除标志（0代表存在 2代表删除）
      */

xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java

@@ -856,6 +856,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
         for (StoreOrderDetail orderDetail : orderDetails) {
             //明细->已发货
             orderDetail.setDetailStatus(EOrderStatus.SHIPPED.getValue());
+            orderDetail.setDeliveryOverTime(new Date());
             int orderDetailSuccess = storeOrderDetailMapper.updateById(prepareUpdate(orderDetail));
             if (orderDetailSuccess == 0) {
                 throw new ServiceException(Constants.VERSION_LOCK_ERROR_COMMON_MSG);
@@ -938,6 +939,7 @@ public class StoreOrderServiceImpl implements IStoreOrderService {
             }
             //明细->已发货
             orderDetail.setDetailStatus(EOrderStatus.SHIPPED.getValue());
+            orderDetail.setDeliveryOverTime(new Date());
             orderDetail.setExpressId(expressId);
             orderDetail.setExpressType(EExpressType.STORE.getValue());
             orderDetail.setExpressStatus(EExpressStatus.COMPLETED.getValue());