From e6682c9434f133a25660110e39a1f0f993267a65 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 27 七月 2023 14:03:55 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/phone/TicketController.java | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index b05ef68..902d4c8 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
@@ -50,6 +54,8 @@
private final StreetLogoService streetLogoService;
+ private final NowPayOrderService nowPayOrderService;
+
//鍥剧墖鍥炴樉
@RequestMapping(value = "/showImg", method = RequestMethod.GET)
public void getAwardAsByteArray(HttpServletResponse response, HttpServletRequest request) throws IOException {
@@ -71,10 +77,11 @@
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())
+ .ne(Ticket::getStatus,3)
.orderByDesc(Ticket::getCreateTime);
return R.ok(ticketService.page(page, wrapper));
}
@@ -116,6 +123,7 @@
}
ticket.setStatus(1);//宸插鐞�
+ ticket.setPayStatus(0);
ticketService.saveOrUpdate(ticket);
if(StringUtils.isBlank(ticket.getQrUrl())){
@@ -163,6 +171,21 @@
public R getById(@PathVariable("id" ) Integer id) {
Ticket byId = ticketService.getById(id);
byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
+ String shouQianMing = byId.getShouQianMing();
+ String zfQianMing1 = byId.getZfQianMing1();
+ String zfQianMing2 = byId.getZfQianMing2();
+ if(shouQianMing != null){
+ String get = FileUtil.netSourceToBase64(shouQianMing, "GET");
+ byId.setShouQianMing("data:image/png;base64,"+get);
+ }
+ if(zfQianMing1 != null){
+ String get = FileUtil.netSourceToBase64(zfQianMing1, "GET");
+ byId.setZfQianMing1("data:image/png;base64,"+get);
+ }
+ if(zfQianMing2 != null){
+ String get = FileUtil.netSourceToBase64(zfQianMing2, "GET");
+ byId.setZfQianMing2("data:image/png;base64,"+get);
+ }
return R.ok(byId);
}
@@ -182,7 +205,33 @@
String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
ticket.setMoneyStr(s.toString());
}
- return R.ok(ticketService.updateById(ticket));
+ if(StringUtils.isBlank(ticket.getZfName1())){
+ ticket.setZfName1("鐜嬩繆璇�");
+ ticket.setZfName1("寮犲噣闆�");
+ ticket.setZfNum1("03041699001");
+ ticket.setZfNum2("03041618001");
+ ticket.setZfQianMing1("http://183.196.93.178:8089/ffzf/fileinfo/showImg/wangjunxiang.png");
+ ticket.setZfQianMing2("http://183.196.93.178:8089/ffzf/fileinfo/showImg/zhangjinglei.png");
+ }
+ if(StringUtils.isBlank(ticket.getNumber())){
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ }else {
+ 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("鏇存柊澶辫触");
+ }
}
public void saveLogo(String name,String lng,String lat){
@@ -207,6 +256,7 @@
tb.setCarType(ticket.getCarType());
tb.setColor(ticket.getColor());
tb.setViolationCount(1);
+ tb.setIsActive(0);
ticketBlackService.saveOrUpdate(tb);
}else {
TicketBlack ticketBlack = all.get(0);
@@ -325,7 +375,32 @@
@PostMapping("/jiaofei" )
public R jiaofei(Integer id) {
Ticket byId = ticketService.getById(id);
- byId.setContent(violationTypeService.getById(byId.getViolationTypeId()).getContent());
- return R.ok(byId);
+ if(byId.getPayStatus() == 1){
+ return R.failed("姝ょ綒鍗曞凡鏀粯");
+ }else if(byId.getMoney() == 0){
+ return R.failed("姝ょ綒鍗曟棤闇�缂磋垂");
+ }else {
+ NowPayOrder nowPayOrder = new NowPayOrder();
+ nowPayOrder.setQueryId(byId.getId());
+ nowPayOrder.setType(0);
+ nowPayOrder.setCarNo(byId.getCarNo());
+ nowPayOrderService.saveOrder(nowPayOrder);
+ return R.ok("璇锋壂鐮佺即璐�");
+ }
+ }
+
+ /**
+ * 娴嬭瘯瀵规帴
+ * @param
+ * @return R
+ */
+ @ApiOperation(value = "娴嬭瘯瀵规帴", notes = "娴嬭瘯瀵规帴")
+ @GetMapping("/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