From 27c6695551c7229786ef2cf7dae722886c9edf53 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 09 八月 2024 22:53:44 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/java/com/taoke/autopay/controller/client/OrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 dd79e9e..10de62d 100644
--- a/src/main/java/com/taoke/autopay/controller/client/OrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/client/OrderController.java
@@ -232,7 +232,7 @@
}
if (order.getUid() != null) {
- WxUserOrderCount countInfo = wxUserOrderCountService.get(order.getUid(), OrderCountTypeEnum.DY_ORDER_PAY, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
+ WxUserOrderCount countInfo = wxUserOrderCountService.get(order.getUid(), OrderCountTypeEnum.DY_ORDER_PAY, TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT));
if (countInfo != null) {
WxUserSettings settings = wxUserSettingService.getUserSettings(order.getUid());
if (settings.getDyOrderCountPerDay() <= countInfo.getOrderCount()) {
@@ -310,7 +310,7 @@
DYOrderDto dyOrderDto =null;
try {
- dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money, null);
+ dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money, null, null);
}catch(KeyVerifyException ve){
throw new KeyOrderException("鍙ｄ护楠岃瘉澶辫触锛�" + ve.getMessage());
}
@@ -336,7 +336,7 @@
break;
}
- WxUserOrderCount countInfo = wxUserOrderCountService.get(order.getUid(), orderCountType, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
+ WxUserOrderCount countInfo = wxUserOrderCountService.get(order.getUid(), orderCountType, TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT));
if (countInfo != null) {
WxUserSettings settings = wxUserSettingService.getUserSettings(order.getUid());
int maxOrderCount = settings.getDyOrderCountPerDay();
@@ -420,7 +420,7 @@
loggerPay.info("澶勭悊鏀粯澶辫触瀹屾垚");
} else {
try {
- keyOrderService.paySuccess(id, "鏀粯鎴愬姛", TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
+ keyOrderService.paySuccess(id, "鏀粯鎴愬姛", TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT));
loggerPay.info("澶勭悊鏀粯鎴愬姛瀹屾垚");
} catch (WxOrderCountException e) {
loggerPay.error(e.getMessage());
--
Gitblit v1.8.0