From bc56870059cca013649077af0e53891cba8dbfd1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 04 八月 2024 09:43:41 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/java/com/taoke/autopay/controller/client/OrderController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/client/OrderController.java b/src/main/java/com/taoke/autopay/controller/client/OrderController.java
index d87b8c1..dd79e9e 100644
--- a/src/main/java/com/taoke/autopay/controller/client/OrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/client/OrderController.java
@@ -104,6 +104,7 @@
clientInfoService.setActiveTime(filter.getUid(), new Date());
query.start = (filter.getPage() - 1) * filter.getPageSize();
query.count = filter.getPageSize();
+ query.minCreateTime = new Date(System.currentTimeMillis()-1000*60*30L);
if (filter.getState() != null) {
switch (filter.getState()) {
case OrderFilter.STATE_NOT_PROCESS:
@@ -309,7 +310,7 @@
DYOrderDto dyOrderDto =null;
try {
- dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money);
+ dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money, null);
}catch(KeyVerifyException ve){
throw new KeyOrderException("鍙ｄ护楠岃瘉澶辫触锛�" + ve.getMessage());
}
@@ -360,6 +361,7 @@
orderUpdate.setPayType(Constant.PAY_TYPE_WITH_ORDER_NO);
}else{
orderUpdate.setPayType(Constant.PAY_TYPE_WITH_MONEY);
+ orderUpdate.setOrderChannel(OrderChannelEnum.unknown.getKey());
}
orderUpdate.setExcutePayTime(new Date());
keyOrderService.update(orderUpdate);
--
Gitblit v1.8.0