From 4058cdff1546659f29e66414a50d49412df67f41 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 04 七月 2023 15:12:04 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/boying/controller/phone/TicketController.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index c7252ab..3b8aea8 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -28,6 +28,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @RestController
@@ -186,7 +189,23 @@
             String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
             ticket.setMoneyStr(s.toString());
         }
-        return R.ok(ticketService.updateById(ticket));
+        if(StringUtils.isBlank(ticket.getNumber())){
+            ticket = ticketService.getNumber(ticket);
+            ticket.setPush(0);
+            ticketService.uploadInfo(ticket);
+        }
+        return R.ok();
+    }
+
+    //涓庢墽娉曞鎺�
+    @GetMapping("/getResult")
+    public Object getResult(Ticket ticket){
+        if(StringUtils.isNotBlank(ticket.getShouQianMing())){
+            ticketService.updateById(ticket);
+            return R.ok();
+        }else {
+            return R.failed("鏇存柊澶辫触");
+        }
     }
 
     public void saveLogo(String name,String lng,String lat){
@@ -350,8 +369,11 @@
      */
     @ApiOperation(value = "娴嬭瘯瀵规帴", notes = "娴嬭瘯瀵规帴")
     @GetMapping("/test" )
-    public void test() {
+    public R test() {
         Ticket byId = ticketService.getById(13);
+        byId = ticketService.getNumber(byId);
+        byId.setPush(0);
         ticketService.uploadInfo(byId);
+        return R.ok();
     }
 }

--
Gitblit v1.9.1