From 4dfd3b17483445db01c894c253a1b692f01c0067 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 22 九月 2023 18:12:31 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/TicketController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index df919dd..1bf0858 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -77,7 +77,7 @@
public Object findPage(Page page, Ticket ticket){
QueryWrapper<Ticket> wrapper = new QueryWrapper<>();
wrapper.lambda()
- .eq(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
+ .like(StringUtils.isNotBlank(ticket.getCarNo()),Ticket::getCarNo,ticket.getCarNo())
.eq(ticket.getType() != null,Ticket::getType,ticket.getType())
.eq(ticket.getViolationTypeId() != null,Ticket::getViolationTypeId,ticket.getViolationTypeId())
.eq(ticket.getPayStatus() != null,Ticket::getPayStatus,ticket.getPayStatus())
@@ -172,9 +172,19 @@
Ticket byId = ticketService.getById(id);
byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
String shouQianMing = byId.getShouQianMing();
- if(shouQianMing != null){
+ String zfQianMing1 = byId.getZfQianMing1();
+ String zfQianMing2 = byId.getZfQianMing2();
+ if(StringUtils.isNotBlank(shouQianMing)){
String get = FileUtil.netSourceToBase64(shouQianMing, "GET");
byId.setShouQianMing("data:image/png;base64,"+get);
+ }
+ if(StringUtils.isNotBlank(zfQianMing1)){
+ String get = FileUtil.netSourceToBase64(zfQianMing1, "GET");
+ byId.setZfQianMing1("data:image/png;base64,"+get);
+ }
+ if(StringUtils.isNotBlank(zfQianMing2)){
+ String get = FileUtil.netSourceToBase64(zfQianMing2, "GET");
+ byId.setZfQianMing2("data:image/png;base64,"+get);
}
return R.ok(byId);
}
@@ -195,23 +205,30 @@
String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
ticket.setMoneyStr(s.toString());
}
- if(StringUtils.isBlank(ticket.getNumber())){
- ticket = ticketService.getNumber(ticket);
- ticket.setPush(0);
- ticketService.uploadInfo(ticket);
+ if(ticket.getMoney() == 0){
+ if(StringUtils.isNotBlank(ticket.getNumber())){
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ }
}
+ if(StringUtils.isBlank(ticket.getZfName1())){
+ ticket.setZfName1("鐜嬩繆绁�");
+ ticket.setZfName2("寮犲噣闆�");
+ ticket.setZfNum1("03041699001");
+ ticket.setZfNum2("03041618001");
+ ticket.setZfQianMing1("http://127.0.0.1:8089/ffzf/fileinfo/showImg/wangjunxiang.png");
+ ticket.setZfQianMing2("http://127.0.0.1:8089/ffzf/fileinfo/showImg/zhangjinglei.png");
+ }
+ ticketService.updateById(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("鏇存柊澶辫触");
- }
+ ticketService.updateById(ticket);
+ return R.ok();
}
public void saveLogo(String name,String lng,String lat){
--
Gitblit v1.9.1