From 928a66524efbdb2371b7fa6b7ee8b55b910182fa Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 19 四月 2024 08:01:45 +0800
Subject: [PATCH] fix:创建新分支

---
 src/main/java/com/boying/controller/phone/PayController.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index 402aa13..c69da84 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -15,7 +15,10 @@
 import com.boying.service.*;
 import com.boying.util.HTTPEntityUtil;
 import com.google.gson.Gson;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.DigestUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -44,12 +47,14 @@
 @RestController
 @RequestMapping("ffzf/ffPay")
 @RequiredArgsConstructor
+@Tag(description = "ffzf/ffPay" , name = "瀵规帴璐㈡斂鏀粯鎺ュ彛" )
 public class PayController extends BaseController {
 
     private final OrderRecordService orderRecordService;
     private final TicketService ticketService;
     private final TicketBlackService ticketBlackService;
     private final OutParkService outParkService;
+    @Autowired
     private final SystemConfigProperties systemConfigProperties;
     private final ParkService parkService;
     private final WhiteListService whiteListService;
@@ -65,6 +70,7 @@
 
     //鐢熸垚鐢靛瓙缂存鐮�
     @PostMapping("zhiFa")
+    @Operation(summary = "鎵ф硶鐢熸垚缂存鐮�" , description = "鎵ф硶鐢熸垚缂存鐮�" )
     public Object zhiFa(Long id){
         Ticket ticket = ticketService.getById(id);
         if(ticket.getPayStatus()==1){
@@ -166,6 +172,7 @@
 
     //鏀粯鎺ュ彛閫氱煡
     @PostMapping("result")
+    @Operation(summary = "缂磋垂缁撴灉閫氱煡" , description = "缂磋垂缁撴灉閫氱煡" )
     public String result(HttpServletRequest request, String payKey, String payerTypeCode, String payerNum, String payCode, Double amt, String status, String errorInfo, String sign, String signType) throws Exception{
         try {
            // updateOrderRecord(payCode,status);
@@ -177,6 +184,7 @@
 
     //鐢熸垚鐢靛瓙缂存鐮�
     @PostMapping("park2")
+    @Operation(summary = "璐㈡斂缂磋垂鏇存柊鐢熸垚缂存鐮�" , description = "璐㈡斂缂磋垂鏇存柊鐢熸垚缂存鐮�" )
     public Object park2(Long id){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
         String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
@@ -275,6 +283,7 @@
      * 缂存涔�
      */
     @PostMapping("park")
+    @Operation(summary = "瀵规帴閭偍鐢熸垚缂存涔�" , description = "瀵规帴閭偍鐢熸垚缂存涔�" )
     public Object park(Long id){
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
         String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
@@ -387,6 +396,7 @@
      * 鑾峰彇鎵ф硶id
      */
     @PostMapping("getZhifaId")
+    @Operation(summary = "鏇存柊澶у巺缂存鐮�" , description = "鏇存柊澶у巺缂存鐮�" )
     public Object getZhifaId(){
         QueryWrapper<NowPayOrder> wrapper = new QueryWrapper<>();
         wrapper.lambda()
@@ -405,6 +415,7 @@
      * 缂存涔�
      */
     @PostMapping("zhifa")
+    @Operation(summary = "鎵ф硶缂磋垂锛堟柊锛�" , description = "鎵ф硶缂磋垂锛堟柊锛�" )
     public Object zhifa(Long id){
         System.out.println(id+"寮�濮嬬即璐�");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
@@ -540,7 +551,7 @@
             if(status.equals("03")){
                 ticket.setPayStatus(1);
                 dealCar(ticket.getCarNo());
-                if(StringUtils.isNotBlank(ticket.getNumber())){
+                if(StringUtils.isBlank(ticket.getNumber()) || "--".equals(ticket.getNumber())){
                     ticket = ticketService.getNumber(ticket);
                     ticket.setPush(0);
                     ticketService.uploadInfo(ticket);

--
Gitblit v1.9.1