From e59d2141bc8f9bee8b569deaa54158b3759c431e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 29 八月 2025 10:42:40 +0800
Subject: [PATCH] bug修改
---
UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index acfe975..2a88aa1 100644
--- a/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -131,6 +131,9 @@
orderStatusWarpper.setOrderId(orderPrivateCar.getId());
orderStatusWarpper.setOrderType(1);
orderStatusWarpper.setState(orderPrivateCar.getState());
+ orderStatusWarpper.setPayMethod(orderPrivateCar.getPayMethod());
+ orderStatusWarpper.setOrderMoney(orderPrivateCar.getOrderMoney());
+ orderStatusWarpper.setPaymentAdvanceMoney(orderPrivateCar.getPaymentAdvanceMoney());
data.add(orderStatusWarpper);
}
List<OrderTaxi> list = orderTaxiService.queryOrder(uid, 1, 2, 3, 4, 5, 6, 7, 11, 12);
@@ -754,6 +757,9 @@
})
public ResultUtil<BaseWarpper> queryExpectedTime(Double slon, Double slat, Double elon, Double elat){
try {
+ ResultUtil<BaseWarpper> baseWarpperResultUtil = orderService.queryExpectedTime(slon, slat, elon, elat);
+ System.err.println(baseWarpperResultUtil);
+ System.err.println(baseWarpperResultUtil.getData());
return orderService.queryExpectedTime(slon, slat, elon, elat);
}catch (Exception e){
e.printStackTrace();
@@ -1262,7 +1268,7 @@
@PostMapping("/base/wxPayOrderTaxi")
public void wxPayOrderTaxi(HttpServletRequest request, HttpServletResponse response){
try {
- Map<String, String> map = payMoneyUtil.weixinpayCallback(request);//icbcPayUtil.payCallback(request);
+ Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
if(null != map){
String out_trade_no = map.get("out_trade_no");
String order_id = map.get("transaction_id");
@@ -1304,7 +1310,7 @@
@PostMapping("/base/aliPayOrderTaxi")
public void aliPayOrderTaxi(HttpServletRequest request, HttpServletResponse response){
try {
- Map<String, String> map = payMoneyUtil.alipayCallback(request);//icbcPayUtil.payCallback(request);
+ Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String out_trade_no = map.get("out_trade_no");
String order_id = map.get("trade_no");
@@ -1401,4 +1407,52 @@
e.printStackTrace();
}
}
+
+ /**
+ * 专车微信退款成功回调
+ * @param request
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/transferWXNotify")
+ public void transferWXNotify(HttpServletRequest request, HttpServletResponse response){
+ try {
+ Map<String, String> map = payMoneyUtil.wxRefundCallback(request);
+ if(null != map){
+ String order_id = map.get("refund_id");
+ String out_refund_no = map.get("out_refund_no");
+ String refund_fee = map.get("refund_fee");
+ String result = map.get("result");
+ if(ToolUtil.isNotEmpty(out_refund_no) && ToolUtil.isNotEmpty(order_id)){
+ PrintWriter out = response.getWriter();
+ out.write(result);
+ out.flush();
+ out.close();
+
+ String[] split = out_refund_no.split(",");
+ try{
+ Integer.valueOf(split[0]);
+ }catch (Exception e){
+ split = split[0].split("_");
+ }
+ Integer id = Integer.valueOf(split[0]);
+ Integer type = Integer.valueOf(split[1]);
+ switch (type){
+ case 1:
+ OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(id);
+ if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
+ //添加交易明细
+ transactionDetailsService.saveData(orderPrivateCar.getUserId(), "专车取消退款", Double.valueOf(refund_fee), 2, 1, 1, 1, id);
+ }else {
+ transactionDetailsService.saveData(orderPrivateCar.getUserId(), "专车差价退款", Double.valueOf(refund_fee), 2, 1, 1, 1, id);
+ }
+ break;
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
}
--
Gitblit v1.7.1