From f604df04d1f9fe90ee543a1772a3a8cdb50d3d66 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 08 八月 2025 15:19:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java
index fd573ea..6dfa73e 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/PayInfoController.java
@@ -4,14 +4,17 @@
import com.stylefeng.guns.modular.shunfeng.model.OrderRide;
import com.stylefeng.guns.modular.shunfeng.model.vo.ApiJson;
import com.stylefeng.guns.modular.shunfeng.service.IOrderRideService;
-import com.stylefeng.guns.modular.shunfeng.service.IParamService;
import com.stylefeng.guns.modular.shunfeng.service.ITimeTaskService;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
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.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -22,13 +25,11 @@
/**
* 支付相关接口
*/
-@Api(tags = "顺风车支付相关接口")
+@Api("顺风车支付相关接口")
@Controller
@RequestMapping("/api/payInfo")
public class PayInfoController {
- @Autowired
- private IParamService paramService;
@Autowired
private IOrderRideService orderRideService;
@Autowired
@@ -49,6 +50,13 @@
* @param couponId
* @return
*/
+ @ResponseBody
+ @PostMapping("/payBalanceRide")
+ @ApiOperation(value = "余额支付", httpMethod = "POST")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int"),
+ @ApiImplicitParam(name = "couponId", value = "优惠券id", dataType = "int"),
+ })
public Object payBalanceRide(Integer orderId,Integer couponId){
try {
OrderRide orderRide=orderRideService.selectById(orderId);
@@ -117,7 +125,12 @@
* @return
*/
@ResponseBody
- @RequestMapping("/payOnline")
+ @PostMapping("/payOnline")
+ @ApiOperation(value = "线上支付", httpMethod = "POST")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "int"),
+ @ApiImplicitParam(name = "payType", value = "支付类型 1=支付宝,2 = 微信 3:银行卡 4：小程序", dataType = "int"),
+ })
public Object payOnline(Integer orderId,Integer type,String code,Integer payType,Integer isBalance,HttpServletRequest request,Integer couponId){
try {
if(orderId == null || orderId == 0){
--
Gitblit v1.7.1