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 | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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 49bc15a..10de62d 100644
--- a/src/main/java/com/taoke/autopay/controller/client/OrderController.java
+++ b/src/main/java/com/taoke/autopay/controller/client/OrderController.java
@@ -14,6 +14,7 @@
import com.taoke.autopay.exception.KeyVerifyException;
import com.taoke.autopay.exception.WxOrderCountException;
import com.taoke.autopay.factory.OrderFactory;
+import com.taoke.autopay.manager.OrderPayFailProcessor;
import com.taoke.autopay.service.*;
import com.taoke.autopay.utils.*;
import com.taoke.autopay.utils.order.DYOrderApi;
@@ -82,6 +83,9 @@
@Resource
private SystemConfigService systemConfigService;
+ @Resource
+ private OrderPayFailProcessor orderPayFailProcessor;
+
@ResponseBody
@RequestMapping("listOrder")
@@ -100,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:
@@ -227,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()) {
@@ -287,7 +292,7 @@
int orderType=Constant.ORDER_TYPE_UNKNOWN;
- if(orderNoDesc.contains("鎶栭煶")){
+ if(orderNoDesc.contains("鎶栭煶")||orderNoDesc.contains("涓婃捣鏍肩墿鑷村搧")){
orderType = Constant.ORDER_TYPE_DY;
}else if(orderNoDesc.contains("蹇墜")){
orderType = Constant.ORDER_TYPE_KS;
@@ -305,7 +310,7 @@
DYOrderDto dyOrderDto =null;
try {
- dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money);
+ dyOrderDto = keyOrderService.verifyKey(orderNoDesc, orderStatus, money, null, null);
}catch(KeyVerifyException ve){
throw new KeyOrderException("鍙ｄ护楠岃瘉澶辫触锛�" + ve.getMessage());
}
@@ -331,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();
@@ -356,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);
@@ -403,6 +409,7 @@
if(msg!=null&&msg.contains("瓒呮椂"))
{
loggerPay.info(String.format("鍥犱负瓒呮椂鏀粯澶辫触涓嶅鐞嗭細%s-%s", order.getId(), msg));
+ orderPayFailProcessor.processPayFail(order.getId(), msg);
}else {
KeyOrder orderUpdate = new KeyOrder();
orderUpdate.setId(id);
@@ -413,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