增加签收时间

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -149,11 +149,20 @@ public class SalesOrder implements Serializable {
     private Integer statisticalType;        //导航栏搜索条件 1待确认 2待分配物流 3待发货 4待打单 5待出库 6待揽件 7揽件超时
     private Integer trackingAdminId;        //跟踪信息 操作人id
     private Integer feeCharges;             //维修收费
+    private Date salesSignTime;             // 签收时间
 
     private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<SalesOrderItem> suSalesOrderItemList = new ArrayList<SalesOrderItem>();
     private List<ComplaintDetectInfo> complaintDetectInfoList;
 
+    public Date getSalesSignTime() {
+        return salesSignTime;
+    }
+
+    public void setSalesSignTime(Date salesSignTime) {
+        this.salesSignTime = salesSignTime;
+    }
+
     public Integer getSalesPostPayType() {
         return salesPostPayType;
     }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -417,7 +417,10 @@ public class MQTask implements InitializingBean {
 		logger.info("---------------- 询维修超时数据并短信通知结束 ---------------");
 	}
 
-	@Scheduled(cron = "0 0/30 * * * ?")//每半个小时执行一次
+	/**
+	 * 定时拉取签收信息
+	 */
+	@Scheduled(fixedDelay = 3_600_000, initialDelay = 3_000)//每小时执行一次
 	public void orderCaseDate(){
 		if (isDebug) {
 			logger.info("debug模式，无法运行正式任务");

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_detail.ftl

@@ -279,6 +279,10 @@
                 <th width="10">揽件时间：</th>
                 <td width="10" style="font-weight: normal;"><#if order.orderCaseDate??>${order.orderCaseDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
             </tr>
+            <tr>
+                <th width="10">签收时间：</th>
+                <td width="10" colspan="4" style="font-weight: normal;"><#if (order.salesSignTime)??>${order.salesSignTime?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
+            </tr>
             </thead>
         </table>
         <div class="row cl">