From 33632d86bbf74e922ce406d9032fadc90f6bba5e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 18:58:13 +0800
Subject: [PATCH] 更新用户端功能
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 52 +++++++++++++++++++---------------------------------
1 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 56dc129..731daf1 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -5,17 +5,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.CharteredCar.server.IOrderCharteredCarService;
-import com.stylefeng.guns.modular.account.model.TEnterpriseWithdrawal;
import com.stylefeng.guns.modular.account.server.ITEnterpriseWithdrawalService;
-import com.stylefeng.guns.modular.account.server.UserWithdrawalService;
import com.stylefeng.guns.modular.call.server.IOrderCallService;
-import com.stylefeng.guns.modular.cloudPayment.example.AllocationExample;
-import com.stylefeng.guns.modular.cloudPayment.example.DepositExample;
-import com.stylefeng.guns.modular.cloudPayment.req.AllocationReq;
-import com.stylefeng.guns.modular.cloudPayment.req.DepositReq;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
-import com.stylefeng.guns.modular.enums.PaymentTypeEnum;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
@@ -31,23 +24,22 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
-import com.unionpay.upyzt.exception.UpyztException;
-import com.unionpay.upyzt.resp.AllocationResp;
-import com.unionpay.upyzt.resp.DepositResp;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
-import sun.security.krb5.internal.crypto.Des;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -125,22 +117,26 @@
@Autowired
private IAdditionalFeeService additionalFeeService;
-
+
@Autowired
private ITEnterpriseWithdrawalService enterpriseWithdrawalService;
@Autowired
- private ICompanyService companyService;
+ private ICompanyService companyService;
@Autowired
private IUserCouponRecordService userCouponRecordService;
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
-
-
-
-
-
+
+ @Resource
+ private SystemPriceMapper systemPriceMapper;
+
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
+
/**
* 获取正在进行中的订单
+ *
* @param request
* @return
*/
@@ -421,15 +417,8 @@
return ResultUtil.runErr();
}
}
-
-
-
- @Autowired
- private RedisUtil redisUtil;
-
- @Resource
- private SystemPriceMapper systemPriceMapper;
-
+
+
/**
* 获取服务中的详情数据
* @param orderId
@@ -489,7 +478,7 @@
}
orderList= orderPrivateCarService.queryOrderInfo2(orderId,6,null,null);
if(orderInfoWarpper.getState()>1 && orderInfoWarpper.getDriverId()!=0){
- String value = redisUtil.getValue("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
+ String value = (String) redisTemplate.opsForValue().get("DRIVER" + String.valueOf(orderInfoWarpper.getDriverId()));
if(value==null || value.equals("")){
if(orderList.isEmpty()){
orderList= orderPrivateCarService.queryOrderInfo2(orderId,5,"0","0");
@@ -1579,15 +1568,12 @@
System.out.println("完成订单微信支付回调");
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
System.out.println("wx支付信息："+map);
-
-
if(null != map){
String order_id = map.get("transaction_id");
String out_trade_no = map.get("out_trade_no");
String result = map.get("result");
String total_fee = map.get("total_fee");
String transaction_id = map.get("transaction_id");
-
if(ToolUtil.isNotEmpty(out_trade_no) && ToolUtil.isNotEmpty(order_id)){
PrintWriter out = response.getWriter();
out.write(result);
--
Gitblit v1.7.1