From 17caebabf7a6a529b7039c71e21e5a324e31ea20 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 九月 2024 16:23:42 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/java/com/taoke/autopay/service/KeyOrderService.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 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..304bdcd 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;
@@ -35,7 +36,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 +56,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 +74,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 +121,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 +132,19 @@
**/
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);
+
}
--
Gitblit v1.8.0