订单业务功能开发v7 - 订单时间接单维护

nxhs-service/src/main/java/cc/yunxi/domain/po/RecycleOrder.java

@@ -84,8 +84,7 @@ public class RecycleOrder {
     @TableField("staffs_name")
     private String staffsName;
 
-
-    @ApiModelProperty("订单创建时间")
+    @ApiModelProperty("下单时间")
     @TableField("f_creator_time")
     private LocalDateTime creatorTime;
 
@@ -109,10 +108,18 @@ public class RecycleOrder {
 //    @TableField("consult_time_end")
 //    private LocalDateTime consultTimeEnd;
 
-    @ApiModelProperty("收货时间")
+    @ApiModelProperty("接单时间")
     @TableField("receive_time")
     private LocalDateTime receiveTime;
 
+    @ApiModelProperty("到达时间")
+    @TableField("arrival_time")
+    private LocalDateTime arrivalTime;
+
+    @ApiModelProperty("完成时间")
+    @TableField("complete_time")
+    private LocalDateTime completeTime;
+
     @ApiModelProperty("结算时间")
     @TableField("settle_time")
     private LocalDateTime settleTime;

nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorder/RecycleOrderFinishVO.java

@@ -19,9 +19,6 @@ public class RecycleOrderFinishVO {
     @NotBlank(message = "回收订单id不能为空")
     private String id;
 
-    @ApiModelProperty(value = "收货时间", required = true, example = "2024-03-09 14:59:00")
-    private LocalDateTime receiveTime;
-
     @ApiModelProperty(value = "回收员id", hidden = true, example = "533242995646951684")
     private String staffsId;
 

nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailCreateVO.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -27,11 +28,11 @@ public class RecycleOrderDetailCreateVO {
     private String productName;
 
     @ApiModelProperty(value = "商品预估重量", required = true)
-    @NotBlank(message = "商品预估重量不能为空")
+    @NotNull(message = "商品预估重量不能为空")
     private ProductWeightEnum productWeight;
 
     @ApiModelProperty(value = "下单时回收单价", required = true)
-    @NotBlank(message = "下单时回收单价不能为空")
+    @NotNull(message = "下单时回收单价不能为空")
     @DecimalMin(value = "0.01", message = "下单时回收单价数值错误")
     private BigDecimal recoveryPrice;
 

nxhs-service/src/main/java/cc/yunxi/domain/vo/recycleorderdetail/RecycleOrderDetailUpdateVO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -23,7 +24,7 @@ public class RecycleOrderDetailUpdateVO {
     private String productId;
 
     @ApiModelProperty(value = "商品实际重量", required = true, example = "1.08")
-    @NotBlank(message = "商品实际重量不能为空")
+    @NotNull(message = "商品实际重量不能为空")
     @DecimalMin(value = "0.00", message = "商品实际重量数值错误")
     private Double productActualWeight;
 

nxhs-service/src/main/java/cc/yunxi/service/impl/RecycleOrderServiceImpl.java

@@ -110,6 +110,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
         recycleOrder.setOrderNumber(idNumber);
         recycleOrder.setOrderType(OrderTypeEnum.SH_ORDER);
         recycleOrder.setOrderStatus(OrderStatusEnum.PENDING);
+        recycleOrder.setCreatorTime(LocalDateTime.now());
         log.info("create recycleOrder info : {}", recycleOrder);
         this.save(recycleOrder);
 
@@ -136,6 +137,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
             throw new BizIllegalException("订单处理中，无法修改订单信息");
         }
         recycleOrder = BeanUtils.copyBean(orderUpdateVO, RecycleOrder.class);
+        recycleOrder.setUpdateTime(LocalDateTime.now());
         log.info("recycleOrder updateVO: {}", recycleOrder);
         this.updateById(recycleOrder);
     }
@@ -146,6 +148,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
         validateOrderExists(orderTakingVO.getId());
         RecycleOrder recycleOrder = BeanUtils.copyBean(orderTakingVO, RecycleOrder.class);
         recycleOrder.setOrderStatus(OrderStatusEnum.UNPROCESSED);
+        recycleOrder.setReceiveTime(LocalDateTime.now());
         log.info("recycleOrder takingVO: {}", recycleOrder);
         this.updateById(recycleOrder);
     }
@@ -159,6 +162,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
         }
         recycleOrder = BeanUtils.copyBean(orderCancelVO, RecycleOrder.class);;
         recycleOrder.setOrderStatus(OrderStatusEnum.CANCELED);
+        recycleOrder.setUpdateTime(LocalDateTime.now());
         log.info("recycleOrder cancelVO: {}", recycleOrder);
         this.updateById(recycleOrder);
         // 是否还要关联操作订单明细? todo
@@ -174,6 +178,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
         }
         recycleOrder = BeanUtils.copyBean(orderReachVO, RecycleOrder.class);;
         recycleOrder.setOrderStatus(OrderStatusEnum.RECYCLING);
+        recycleOrder.setArrivalTime(LocalDateTime.now());
         log.info("recycleOrder orderReachVO: {}", recycleOrder);
         this.updateById(recycleOrder);
     }
@@ -188,6 +193,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
         }
         recycleOrder = BeanUtils.copyBean(orderFinishVO, RecycleOrder.class);;
         recycleOrder.setOrderStatus(OrderStatusEnum.FINISHED);
+        recycleOrder.setCompleteTime(LocalDateTime.now());
         log.info("recycleOrder orderFinishVO: {}", recycleOrder);
         this.updateById(recycleOrder);