From f318c9c7c127b00f353bf45f273096d1dc4b424f Mon Sep 17 00:00:00 2001
From: admin <1101184511@qq.com>
Date: 星期三, 20 八月 2025 01:10:48 +0800
Subject: [PATCH] 功能完善
---
src/main/java/com/taoke/autopay/factory/js2/OrderTaskExecutionDetailFactory.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/factory/js2/OrderTaskExecutionDetailFactory.java b/src/main/java/com/taoke/autopay/factory/js2/OrderTaskExecutionDetailFactory.java
index 303827e..fa18f76 100644
--- a/src/main/java/com/taoke/autopay/factory/js2/OrderTaskExecutionDetailFactory.java
+++ b/src/main/java/com/taoke/autopay/factory/js2/OrderTaskExecutionDetailFactory.java
@@ -40,7 +40,9 @@
.clientId(orderTaskExecutionDetail.getClientId())
.orderNo(orderTaskExecutionDetail.getOrderNo())
.productName(orderTaskExecutionDetail.getProductName())
- .shopName(orderTaskExecutionDetail.getShopName());
+ .shopName(orderTaskExecutionDetail.getShopName())
+ .expectedReviewTime(orderTaskExecutionDetail.getExpectedReviewTime()==null?"":TimeUtil.getGernalTime(orderTaskExecutionDetail.getExpectedReviewTime().getTime(),"yyyy-MM-dd HH:mm:ss"))
+ ;
// 璁剧疆瀹㈡埛绔檮鍔犱俊鎭�
if (clientAdditionalInfo != null) {
@@ -54,10 +56,13 @@
if (executionStatus != null) {
if (executionStatus == OrderTaskExecutionDetail.STATUS_NOT_ORDERED) {
builder.executionType(OrderTaskExecutionDetailVO.EXECUTION_TYPE_ORDER);
+ builder.createTime(orderTaskExecutionDetail.getCreateTime());
} else if (executionStatus == OrderTaskExecutionDetail.STATUS_ORDERED) {
builder.executionType(OrderTaskExecutionDetailVO.EXECUTION_TYPE_RECEIVE);
+ builder.createTime(orderTaskExecutionDetail.getOrderTime());
} else if (executionStatus == OrderTaskExecutionDetail.STATUS_RECEIVE_SUCCESS) {
builder.executionType(OrderTaskExecutionDetailVO.EXECUTION_TYPE_REVIEW);
+ builder.createTime(orderTaskExecutionDetail.getExpectedReviewTime());
}
}
@@ -65,13 +70,6 @@
if (!StringUtil.isNullOrEmpty(orderTask.getKeywordContent())) {
builder.key(orderTask.getKeywordContent());
}
-
- // 澶勭悊鏃堕棿瀛楁
- if (orderTaskExecutionDetail.getCreateTime() != null) {
- builder.createTime(TimeUtil.getGernalTime(orderTaskExecutionDetail.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
- }
-
-
return builder.build();
}
}
\ No newline at end of file
--
Gitblit v1.8.0