diff --git a/Ylt/ms-finance/src/main/java/com/charge/finance/api/UserRefundController.java b/Ylt/ms-finance/src/main/java/com/charge/finance/api/UserRefundController.java index 20319b7..689b07b 100644 --- a/Ylt/ms-finance/src/main/java/com/charge/finance/api/UserRefundController.java +++ b/Ylt/ms-finance/src/main/java/com/charge/finance/api/UserRefundController.java @@ -127,7 +127,7 @@ public class UserRefundController { /** - * 用户退款申请 【黄海阅读理解一下】 + * 用户退款申请 【黄海理解】 * * @param * @author chenp diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java index adeffaa..3cc9a8b 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java @@ -56,8 +56,7 @@ public class YltControllerForWx { @PostMapping("/station/getCarList") public ResultVO getCarList(HttpServletRequest request) { //获取当前登录人员信息 - Record user = ym.getUser(request); - int userId = Integer.parseInt(user.get("userId")); + int userId = Integer.parseInt(request.getHeader("userId").toString()); List list = ym.getCarList(userId); return ResultVO.success(list); } @@ -181,5 +180,21 @@ public class YltControllerForWx { } return null; } + + /** + * 功能:找出所有符合条件的退款单号列表 + * 1、没有参加充值活动 + * 2、用户余额小于50元(后台可以设置) + * + * @return + */ + @PostMapping("/UserRefund/getRefundIds") + public ResultVO getRefundIds(HttpServletRequest request) { + //获取当前登录人员信息 + String userId = request.getHeader("userId"); + //有哪些可以退款的订单 + List list = ym.getRefundIds(userId); + return ResultVO.success(list); + } } diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltModel.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltModel.java index 4801828..10c6441 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltModel.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltModel.java @@ -1,11 +1,7 @@ package com.charge.task.controller; -import com.charge.bizcommon.util.JwtUtil; import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Record; -import io.jsonwebtoken.Claims; - -import javax.servlet.http.HttpServletRequest; import java.util.List; public class YltModel { @@ -23,25 +19,6 @@ public class YltModel { return record; } - /** - * 功能:根据JWT的token获取当前用户信息 - * - * @param request - * @return - */ - public Record getUser(HttpServletRequest request) { - //从Http请求头中获取Authorization - String Authorization = request.getHeader("Authorization"); - String secret = JwtUtil.SECRET; - String token = Authorization.replaceFirst(JwtUtil.AUTHORIZATION_STARTER, ""); - Claims cs = JwtUtil.getClaimsFromToken(token, secret); - String userId = cs.get("userId", String.class); - String phone = cs.get("phone", String.class); - Record record = new Record(); - record.set("userId", userId); - record.set("phone", phone); - return record; - } /** * 功能:传入一个订单ID,判断它所在的车场是不是第三方道闸的车场 @@ -134,4 +111,14 @@ public class YltModel { record.set("result", result); Db.save("t_ext_dz_log", "order_no", record); } + + /** + * 功能:找出所有符合条件的退款单号列表 + * @param userId + * @return + */ + public List getRefundIds(String userId) { + String sql = "select * from t_account_recharge where user_id=? and refund_state=0 order by id desc"; + return Db.find(sql, userId); + } } diff --git a/业务梳理/退款逻辑.md b/业务梳理/退款逻辑.md index 5b63bea..1292839 100644 --- a/业务梳理/退款逻辑.md +++ b/业务梳理/退款逻辑.md @@ -156,3 +156,17 @@ D:\dsWork\YltProject\Ylt\ms-finance\src\main\java\com\charge\finance\service\imp public ResultVO operateAccount(AdminFinanceDTO adminFinanceDTO) ``` +``` +-- App支付记录表 +-- 退款状态(0未退款 1已退款 2 退款失败 3退款申请审核 4未退款驳回 5建帮活动不可退款 6活动充值) +select * from t_account_recharge where user_id=95001 and refund_state=0 order by id desc ; + +select * from t_account_recharge where memo='充值活动充值'; +select * from t_account_recharge where refund_state=6 and memo='充值活动充值'; +select * from t_account_recharge where refund_state=6 and memo<>'充值活动充值'; + +-- 结论: +-- 1、看refund_state=6 ,memo不靠谱 +-- 2、从上面的情况来看,refund_state=0的才可以进行处理 +``` +