From fa677dec1c55db004a31beefb1e346e18c7858c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 18:41:29 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/taoke/autopay/service/KeyOrderService.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/service/KeyOrderService.java b/src/main/java/com/taoke/autopay/service/KeyOrderService.java
index 48b3f2f..d47da39 100644
--- a/src/main/java/com/taoke/autopay/service/KeyOrderService.java
+++ b/src/main/java/com/taoke/autopay/service/KeyOrderService.java
@@ -29,6 +29,8 @@
**/
public KeyOrder selectById(String id);
+ public KeyOrder selectByIdForUpdate(String id);
+
/**
* @return void
* @author hxh
@@ -36,7 +38,7 @@
* @date 19:19 2024/6/14
* @param: key
**/
- public KeyOrder addKeyOrder(SubmitKeyInfo keyInfo, Long uid, String day) throws KeyOrderException, WxOrderCountException;
+ public KeyOrder addKeyOrder(SubmitKeyInfo keyInfo, Long uid, String day,Integer orderType, DYOrderDto orderDto) throws KeyOrderException, WxOrderCountException;
/**
* @return void
@@ -56,7 +58,7 @@
* @param: day
* @return void
**/
- public void paySuccess(String id, String stateDesc,String day) throws WxOrderCountException ;
+ public void paySuccess(String id, String stateDesc,String day,String payMerchant) throws WxOrderCountException ;
/**
@@ -89,7 +91,7 @@
* @description 鑾峰彇鍙敤浜庡垎閰嶇殑璁惧ID淇℃伅
* @date 16:41 2024/6/17
**/
- public Long getCanDistributeUid();
+ public Long getCanDistributeUid(int maxQueueSize);
/**
* @return java.util.List<com.taoke.autopay.entity.KeyOrder>
@@ -121,7 +123,7 @@
* @param: money
* @return void
**/
- public DYOrderDto verifyKey(String orderNoDesc, String orderStatus, String money) throws KeyVerifyException;
+ public DYOrderDto verifyKey(String orderNoDesc, String orderStatus, String money, Long uid, String keyId) throws KeyVerifyException;
/**
* @author hxh
@@ -147,4 +149,21 @@
*/
public long countAgentId(KeyOrderMapper.DaoQuery query);
+ /**
+ * @author hxh
+ * @description 缁熻鐢ㄦ埛杩樻病澶勭悊鐨勮鍗曟暟閲�
+ * @date 18:26 2025/2/7
+ * @param: uid
+ * @param: minCreateTime
+ * @return long
+ **/
+ public long countUserNotDoOrder(Long uid, Date minCreateTime);
+
+ /**
+ * 鎷掔粷鏀粯
+ * @param id
+ * @param rejectMsg
+ */
+ public void rejectPay(String id,String rejectMsg);
+
}
--
Gitblit v1.8.0