From 4f27e2a21aa7c0cbd07447b43fc3b83fd1525f88 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 10 七月 2023 15:07:25 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/TicketController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 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..5d26b5f 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -10,6 +10,7 @@
import com.boying.entity.*;
import com.boying.service.*;
import com.boying.util.DateUtilOther;
+import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -28,6 +29,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
@@ -167,6 +171,11 @@
public R getById(@PathVariable("id" ) Integer id) {
Ticket byId = ticketService.getById(id);
byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
+ String shouQianMing = byId.getShouQianMing();
+ if(shouQianMing != null){
+ String get = FileUtil.netSourceToBase64(shouQianMing, "GET");
+ byId.setShouQianMing(get);
+ }
return R.ok(byId);
}
@@ -186,7 +195,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){
@@ -211,6 +236,7 @@
tb.setCarType(ticket.getCarType());
tb.setColor(ticket.getColor());
tb.setViolationCount(1);
+ tb.setIsActive(0);
ticketBlackService.saveOrUpdate(tb);
}else {
TicketBlack ticketBlack = all.get(0);
@@ -350,8 +376,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