czg_team/video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付订单请求修改

Browse Source
This commit is contained in:
GYJ
2024-12-04 14:49:55 +08:00
parent 1c5bae5118
commit ce5740d192
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
View File

@@ -14,12 +14,14 @@ import com.sqx.modules.pay.wuyou.BaseResp;
import com.sqx.modules.pay.wuyou.Encrypt; import com.sqx.modules.pay.wuyou.Encrypt;
import com.sqx.modules.pay.wuyou.NotifyDto; import com.sqx.modules.pay.wuyou.NotifyDto;
import com.sqx.modules.pay.wuyou.WuyouPay; import com.sqx.modules.pay.wuyou.WuyouPay;
import com.sqx.modules.utils.AliPayOrderUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.PathParam;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@@ -50,8 +52,8 @@ public class WuyouController {
} }
@ApiOperation("支付订单") @ApiOperation("支付订单")
@PostMapping("/payOrder") @GetMapping("/payOrder/{orderId}")
public Result payOrder(HttpServletRequest request, @RequestBody Long orderId, @RequestAttribute("userId") Long userId) { public Result payOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId) {
Orders order = ordersService.getById(orderId); Orders order = ordersService.getById(orderId);
if (order == null) { if (order == null) {
return Result.error("订单不存在"); return Result.error("订单不存在");
@@ -61,10 +63,6 @@ public class WuyouController {
return Result.error("订单已支付"); return Result.error("订单已支付");
} }
if (!order.getUserId().equals(userId)) {
return Result.error("订单不属于当前用户");
}
PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo()); PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo());
if (payDetails == null) { if (payDetails == null) {
payDetails = new PayDetails(); payDetails = new PayDetails();
@@ -76,6 +74,9 @@ public class WuyouController {
payDetails.setType(1); payDetails.setType(1);
payDetails.setClassify(9); payDetails.setClassify(9);
payDetailsDao.insert(payDetails); payDetailsDao.insert(payDetails);
} else {
payDetails.setOrderId(AliPayOrderUtil.createOrderId());
payDetailsDao.updateById(payDetails);
} }
BaseResp baseResp = WuyouPay.payOrder(order.getOrdersNo(), order.getPayMoney().toString(), request.getHeader("User-Agent")); BaseResp baseResp = WuyouPay.payOrder(order.getOrdersNo(), order.getPayMoney().toString(), request.getHeader("User-Agent"));