From d6a127f4da8a9662e77364be002054870a5fcc4b Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 02 十一月 2023 11:35:39 +0800
Subject: [PATCH] 提交更新
---
src/main/java/com/boying/controller/phone/TicketController.java | 22 ++++++++++++++++------
src/main/java/com/boying/job/PayResult2Scheduled.java | 1 +
src/main/java/com/boying/job/YCGetEticketScheduled.java | 2 +-
src/main/java/com/boying/controller/OutParkController.java | 3 +++
src/main/java/com/boying/service/impl/WXServiceImpl.java | 2 ++
src/main/java/com/boying/job/YCEticketScheduled.java | 2 +-
src/main/java/com/boying/common/SystemConfigProperties.java | 5 ++++-
src/main/java/com/boying/controller/phone/PayController.java | 4 +++-
src/main/java/com/boying/controller/phone/YCPayController.java | 4 ++++
9 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/boying/common/SystemConfigProperties.java b/src/main/java/com/boying/common/SystemConfigProperties.java
index 317957f..a31d930 100644
--- a/src/main/java/com/boying/common/SystemConfigProperties.java
+++ b/src/main/java/com/boying/common/SystemConfigProperties.java
@@ -1,11 +1,14 @@
package com.boying.common;
+import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.NoArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
-@Configuration
+@Component
@Data
public class SystemConfigProperties {
diff --git a/src/main/java/com/boying/controller/OutParkController.java b/src/main/java/com/boying/controller/OutParkController.java
index 47d3411..fdaea6f 100644
--- a/src/main/java/com/boying/controller/OutParkController.java
+++ b/src/main/java/com/boying/controller/OutParkController.java
@@ -55,6 +55,7 @@
@PostMapping("/findPage")
public Object findPage(Page page, String carNo,Long parkId,String payCode,String date) throws ParseException {
List<OutPark> list = outParkService.getList(page.getCurrent(), page.getSize(), carNo,parkId,payCode, date);
+ System.out.println(list);
long count = outParkService.getCount(carNo,parkId,payCode, date);
for (OutPark record : list) {
record.setParkName(parkService.getById(record.getParkId()).getName());
@@ -82,6 +83,7 @@
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Barrier::getCode2,code);
+ System.out.println("code :" +code);
List<Barrier> all = barrierService.list(wrapper);
if(all.size()==0){
return R.failed("鏈壘鍒拌璁惧");
@@ -107,6 +109,7 @@
//閬撻椄code
@PostMapping("/findByBarrierCode2")
public Object findById2(String code2) {
+ System.out.println("code2 :"+code2);
QueryWrapper<Barrier> wrapper = new QueryWrapper<>();
wrapper.lambda()
.eq(Barrier::getCode2,code2);
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index 402aa13..c3322aa 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -16,6 +16,7 @@
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.PostMapping;
@@ -50,6 +51,7 @@
private final TicketService ticketService;
private final TicketBlackService ticketBlackService;
private final OutParkService outParkService;
+ @Autowired
private final SystemConfigProperties systemConfigProperties;
private final ParkService parkService;
private final WhiteListService whiteListService;
@@ -540,7 +542,7 @@
if(status.equals("03")){
ticket.setPayStatus(1);
dealCar(ticket.getCarNo());
- if(StringUtils.isNotBlank(ticket.getNumber())){
+ if(StringUtils.isBlank(ticket.getNumber()) || "--".equals(ticket.getNumber())){
ticket = ticketService.getNumber(ticket);
ticket.setPush(0);
ticketService.uploadInfo(ticket);
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index 1bf0858..2253d66 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.*;
@@ -17,6 +16,8 @@
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 +43,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 +68,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 +103,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,7 +134,7 @@
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);
}
@@ -155,7 +162,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);
@@ -220,6 +227,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();
}
diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 8aa3c39..51b5ee0 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -16,6 +16,7 @@
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -52,6 +53,7 @@
private final OrderRecordService orderRecordService;
private final TicketService ticketService;
private final TicketBlackService ticketBlackService;
+
private final SystemConfigProperties systemConfigProperties;
private final WhiteListService whiteListService;
private final EnterParkService enterParkService;
@@ -149,6 +151,7 @@
public Object parkXT(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
OutPark outPark = outParkService.getById(id);
+ System.out.println("id:"+id);
if(outPark.getPrice()==0){
updateOutPark(outPark.getId(),"03");
return R.failed("鏈鍋滆溅鏃犻渶鏀粯璐圭敤");
@@ -296,6 +299,7 @@
*/
@PostMapping("payByWX")
public Object payByWX(Long id,String openId){
+ System.out.println("寮�濮嬫敮浠�");
OutPark outPark = outParkService.getById(id);
String xtyhpay = systemConfigProperties.getXTYHPAY();
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
diff --git a/src/main/java/com/boying/job/PayResult2Scheduled.java b/src/main/java/com/boying/job/PayResult2Scheduled.java
index 60a6397..32b927c 100644
--- a/src/main/java/com/boying/job/PayResult2Scheduled.java
+++ b/src/main/java/com/boying/job/PayResult2Scheduled.java
@@ -49,6 +49,7 @@
.ne(Ticket::getStatus,3)
.eq(Ticket::getPayStatus,0)
.ne(Ticket::getMoney,0)
+ .ne(Ticket::getPayCode,"")
.isNotNull(Ticket::getPayCode)
.orderByDesc(Ticket::getCreateTime);
List<Ticket> list = ticketService.list(wrapper);
diff --git a/src/main/java/com/boying/job/YCEticketScheduled.java b/src/main/java/com/boying/job/YCEticketScheduled.java
index a8d5b2a..32f6305 100644
--- a/src/main/java/com/boying/job/YCEticketScheduled.java
+++ b/src/main/java/com/boying/job/YCEticketScheduled.java
@@ -45,7 +45,7 @@
private SystemConfigProperties systemConfigProperties;
private Boolean taskFlag = false;
- @Scheduled(cron = "0 0/1 * * * ?")
+ //@Scheduled(cron = "0 0/1 * * * ?")
public void execute() throws Exception {
if (taskFlag == true) {
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
diff --git a/src/main/java/com/boying/job/YCGetEticketScheduled.java b/src/main/java/com/boying/job/YCGetEticketScheduled.java
index eb75386..6de0746 100644
--- a/src/main/java/com/boying/job/YCGetEticketScheduled.java
+++ b/src/main/java/com/boying/job/YCGetEticketScheduled.java
@@ -37,7 +37,7 @@
private SystemConfigProperties systemConfigProperties;
private Boolean taskFlag = false;
- @Scheduled(cron = "0 0/1 * * * ?")
+ //@Scheduled(cron = "0 0/1 * * * ?")
public void execute() throws Exception {
if (taskFlag == true) {
System.out.println("姝ｅ湪杩愯锛屽己鍒堕��鍑�-------銆�");
diff --git a/src/main/java/com/boying/service/impl/WXServiceImpl.java b/src/main/java/com/boying/service/impl/WXServiceImpl.java
index e368ac3..969a7c0 100644
--- a/src/main/java/com/boying/service/impl/WXServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/WXServiceImpl.java
@@ -43,6 +43,8 @@
String openId = jsonObject.getString("openid");
//鎷夊彇鐢ㄦ埛淇℃伅
//getUserMsg(access_token, openId);
+ System.out.println("codeOpen:"+code);
+ System.out.println("openid:"+openId);
return openId;
} catch (Exception e) {
e.printStackTrace();
--
Gitblit v1.9.1