From 61eb9d64f3de0cd5fac288c454063e2bc2691643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Thu, 15 Aug 2024 14:45:45 +0800
Subject: [PATCH] 'commit'
---
.../charge/orderbk/client/TaskServiceApi.java | 4 -
.../client/TaskServiceApiFallback.java | 5 --
.../ManualOrderStatusHandlerController.java | 13 ---
业务梳理/退款逻辑.md | 80 ++++++-------------
4 files changed, 24 insertions(+), 78 deletions(-)
diff --git a/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApi.java b/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApi.java
index 8ad7a31..478b650 100644
--- a/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApi.java
+++ b/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApi.java
@@ -31,10 +31,6 @@ public interface TaskServiceApi {
@PostMapping(value = "/handlerOrder/completeUnReportOrder")
CommonResponse completeUnReportOrder(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate);
- //Add By HuangHai 2024-08-13
- @PostMapping(value = "/handlerOrder/completeUnReportOrderByOrderNo")
- CommonResponse completeUnReportOrderByOrderNo(@RequestParam("orderNo") String orderNo);
-
@PostMapping(value = "/handlerOrder/completeUnReportReverseOrder")
CommonResponse completeUnReportReverseOrder();
diff --git a/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApiFallback.java b/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApiFallback.java
index 9dfdc93..3582872 100644
--- a/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApiFallback.java
+++ b/Ylt/ms-admin/src/main/java/com/charge/orderbk/client/TaskServiceApiFallback.java
@@ -20,16 +20,11 @@ public class TaskServiceApiFallback implements TaskServiceApi{
return null;
}
- //Add By HuangHai 2024-08-13
@Override
public CommonResponse completeUnReportOrder(String startDate, String endDate) {
return null;
}
- @Override
- public CommonResponse completeUnReportOrderByOrderNo(String orderNo) {
- return null;
- }
@Override
public CommonResponse completeUnReportReverseOrder() {
diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java
index e320d99..751d4e7 100644
--- a/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java
+++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/ManualOrderStatusHandlerController.java
@@ -54,19 +54,6 @@ public class ManualOrderStatusHandlerController {
asyncTaskService.completeUnReportOrder(hangUpOrder);
return ResultVO.success();
}
-
- /**
- * Add By HuangHai 2024-08-13
- * 功能：对于指定的订单号，进行补单【反向，互联互通】
- *
- * @param orderNo
- * @return
- @PostMapping("/completeUnReportReverseOrder")
- public ResultVO completeUnReportReverseOrderByOrderNo(String orderNo) {
- EquipmentChargeOrderDO hangUpOrder = equipmentChargeOrderDOMapper.queryChargeOrderByOrderNo(orderNo);
- asyncTaskService.completeUnReportReverseOrder(hangUpOrder);
- return ResultVO.success();
- }*/
/******************************************************************************************/
@ApiOperation("批量处理挂起正向订单，进行补单")
diff --git a/业务梳理/退款逻辑.md b/业务梳理/退款逻辑.md
index aa2a116..c3dd6d5 100644
--- a/业务梳理/退款逻辑.md
+++ b/业务梳理/退款逻辑.md
@@ -49,61 +49,7 @@ D:\dsWork\YltProject\Ylt\ms-finance\src\main\java\com\charge\finance\controller\
LEFT JOIN t_user tu ON te.user_id = tu.id
LEFT JOIN t_user_card c ON tu.id = c.user_id
WHERE
- refund_state IN ( 1, 2, 3, 4 )
-
- AND tu.user_owner_id = #{dto.ownerId}
-
-
- AND tu.user_type = #{dto.userType}
-
-
- AND tu.user_name like "%"#{dto.userName}"%"
-
-
- AND tu.phone= #{dto.phone}
-
-
-
- AND outtradeno = #{dto.outTradeNo}
-
-
- AND tu.id = #{dto.userId}
-
-
-
- AND refund_outtradno = #{dto.refundOuttradno}
-
-
-
- AND pay_type = #{dto.payType}
-
-
-
-
-
-
- AND refund_apply_time >= date_format(#{dto.refundStartTime} ,'%Y-%m-%d %H:%i:%s')
-
-
- AND refund_apply_time <= date_format(#{dto.refundEndTime} ,'%Y-%m-%d %H:%i:%s')
-
-
-
-
- AND refund_time >= date_format(#{dto.refundStartTime} ,'%Y%m%d%H%i%s')
-
-
- AND refund_time <= date_format(#{dto.refundEndTime} ,'%Y%m%d%H%i%s')
-
-
-
-
-
- and refund_state = #{dto.refundState}
-
-
- AND c.card_no = #{dto.cardNo}
-
+ refund_state IN ( 1, 2, 3, 4 )
GROUP BY te.id
ORDER BY te.id DESC
@@ -129,13 +75,35 @@ select * from t_account_recharge where user_id=53958 and refund_state=6 order by
+
+
+
+
```sql
App支付记录表 t_account_recharge
refund_state
refund_state IN ( 1, 2, 3, 4 )
退款状态（0未退款 1已退款 2 退款失败 3退款申请审核 4未退款驳回 5建帮活动不可退款）
+```
+
+
+
+```sql
+4200002307202408129671269468
+
+# 查看这个充值订单是不是可以退款
+select * from t_account_recharge where outtradeno='4200002307202408129671269468'
+refund_state =6 是参加了活动不能退款的
+refund_state =0 是未退款的
+应该检查此充值订单的refund_state 是否为0。
+
+# 同时需要满足金额小于一个指定的数值，比如50元
+
+
-select * from t_account_recharge where outtradeno='4200002328202408130579252328'
+# 其它充值订单
+4200002345202408109427639311
+4200002227202406207784559922
```