From 80cacfd0dcee0174f2a8d9ae322a2fcf857cef63 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 04 十二月 2024 15:31:35 +0800
Subject: [PATCH] fix ： 新增修改出场接口
---
src/main/java/com/boying/controller/phone/TicketController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 1bf0858..5f65c09 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.boying.common.R;
-import com.boying.common.SystemConfigProperties;
import com.boying.entity.*;
import com.boying.service.*;
@@ -13,10 +12,13 @@
import com.boying.util.FileUtil;
import com.boying.util.NumberToCN;
import io.swagger.annotations.ApiOperation;
+
import lombok.RequiredArgsConstructor;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -42,7 +44,13 @@
private final TicketService ticketService;
- private final SystemConfigProperties systemConfigProperties;
+ @Value("${ffpark.uploadPath}")
+ private String uploadImgPath;
+ @Value("${ffpark.ip2}")
+ private String ip2;
+
+// @Autowired
+// private final SystemConfigProperties systemConfigProperties;
private final UserService userService;
@@ -61,7 +69,7 @@
public void getAwardAsByteArray(HttpServletResponse response, HttpServletRequest request) throws IOException {
String result = request.getParameter("result");
InputStream in = null;
- in = FileUtils.openInputStream(new File(systemConfigProperties.getUploadImgPath()+result));
+ in = FileUtils.openInputStream(new File(uploadImgPath+result));
response.setContentType(MediaType.IMAGE_PNG_VALUE);
ServletOutputStream out = response.getOutputStream();
try {
@@ -96,7 +104,7 @@
if(multipartFile != null){
String fileExtension = FilenameUtils.getExtension(multipartFile.getOriginalFilename());//鑾峰彇鍚庣紑
String newFileName = System.currentTimeMillis() + "." + fileExtension;//鍥剧墖鍚嶇О
- String newFilePath = systemConfigProperties.getUploadImgPath() + newFileName;//涓婁紶璺緞
+ String newFilePath = uploadImgPath + newFileName;//涓婁紶璺緞
File destFile = new File(newFilePath);
FileUtils.writeByteArrayToFile(destFile, multipartFile.getBytes());
if(i != imgs.size()-1){
@@ -127,12 +135,31 @@
ticketService.saveOrUpdate(ticket);
if(StringUtils.isBlank(ticket.getQrUrl())){
- ticket.setQrUrl(systemConfigProperties.getIp2()+"#/index?id="+ticket.getId());
+ ticket.setQrUrl(ip2+"#/index?id="+ticket.getId());
ticketService.saveOrUpdate(ticket);
}
if(StringUtils.isNotBlank(ticket.getLng())&&StringUtils.isNotBlank(ticket.getLat())){
saveLogo(ticket.getAddress(),ticket.getLng(),ticket.getLat());
+ }
+ if(ticket.getType() == 2){
+ try {
+ ticket.setPayStatus(1);
+ QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(TicketBlack::getCarNo,ticket.getCarNo());
+ List<TicketBlack> list = ticketBlackService.list(wrapper);
+ if(list.size()>0){
+ for (TicketBlack ticketBlack : list) {
+ ticketBlackService.removeById(ticketBlack.getId());
+ }
+ }
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
}
return R.ok(ticket);
}
@@ -155,7 +182,7 @@
updateBlackTicket(ticket);
ticketService.saveOrUpdate(ticket);
- ticket.setQrUrl(systemConfigProperties.getIp2()+"#/index?id="+ticket.getId());
+ ticket.setQrUrl(ip2+"#/index?id="+ticket.getId());
ticket.setType(1);
ticketService.saveOrUpdate(ticket);
return R.ok(ticket);
@@ -195,6 +222,15 @@
Ticket ticket =ticketService.getById(id);
ticket.setStatus(3);
ticketService.saveOrUpdate(ticket);
+ QueryWrapper<TicketBlack> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(TicketBlack::getCarNo,ticket.getCarNo());
+ List<TicketBlack> list = ticketBlackService.list(wrapper);
+ if(list.size()>0){
+ for (TicketBlack ticketBlack : list) {
+ ticketBlackService.removeById(ticketBlack.getId());
+ }
+ }
return R.ok("鎿嶄綔鎴愬姛");
}
@@ -206,7 +242,7 @@
ticket.setMoneyStr(s.toString());
}
if(ticket.getMoney() == 0){
- if(StringUtils.isNotBlank(ticket.getNumber())){
+ if(StringUtils.isBlank(ticket.getNumber())){
ticket = ticketService.getNumber(ticket);
ticket.setPush(0);
ticketService.uploadInfo(ticket);
@@ -220,6 +256,9 @@
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");
}
+ if(StringUtils.isBlank(ticket.getNumber())){
+ ticket.setNumber("--");
+ }
ticketService.updateById(ticket);
return R.ok();
}
--
Gitblit v1.9.1