From 595b7935a30e84fba1bc3561d05f9d19d3e32e1f Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期三, 23 四月 2025 00:45:48 +0800
Subject: [PATCH] 后台管理页面完成
---
src/main/java/com/taoke/autopay/service/KeyOrderService.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 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 29c9793..d47da39 100644
--- a/src/main/java/com/taoke/autopay/service/KeyOrderService.java
+++ b/src/main/java/com/taoke/autopay/service/KeyOrderService.java
@@ -1,6 +1,7 @@
package com.taoke.autopay.service;
import com.taoke.autopay.dao.KeyOrderMapper;
+import com.taoke.autopay.dto.ChannelOrderStatistic;
import com.taoke.autopay.dto.DYOrderDto;
import com.taoke.autopay.entity.KeyOrder;
import com.taoke.autopay.exception.KeyOrderException;
@@ -28,6 +29,8 @@
**/
public KeyOrder selectById(String id);
+ public KeyOrder selectByIdForUpdate(String id);
+
/**
* @return void
* @author hxh
@@ -35,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
@@ -55,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 ;
/**
@@ -73,13 +76,22 @@
public long count(KeyOrderMapper.DaoQuery query);
+ public List<KeyOrder> listWithUser(KeyOrderMapper.DaoQuery query);
+
+ public long countWithUser(KeyOrderMapper.DaoQuery query);
+
+ public ChannelOrderStatistic statisticWithUser(KeyOrderMapper.DaoQuery query);
+
+ public List<ChannelOrderStatistic> statisticChannelOrders(Long agentId,Date startTime,Date endTime);
+
+
/**
* @return java.lang.Long
* @author hxh
* @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>
@@ -111,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
@@ -122,4 +134,36 @@
**/
public void removeDistributedClient(String id);
+ /**
+ * 浠ｇ悊ID鍒楄〃
+ * @param query
+ * @return
+ */
+ public List<Long> listAgentId(KeyOrderMapper.DaoQuery query);
+
+
+ /**
+ * 浠ｇ悊ID鏁伴噺
+ * @param query
+ * @return
+ */
+ 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