From 7bc78d8f70a4d11e46f8bd640228804a3dd0dc68 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 22 四月 2024 10:52:29 +0800
Subject: [PATCH] Merge branch 'master2'
---
src/main/java/com/boying/controller/phone/PayController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index f774b51..c69da84 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -15,7 +15,10 @@
import com.boying.service.*;
import com.boying.util.HTTPEntityUtil;
import com.google.gson.Gson;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
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;
@@ -44,12 +47,14 @@
@RestController
@RequestMapping("ffzf/ffPay")
@RequiredArgsConstructor
+@Tag(description = "ffzf/ffPay" , name = "瀵规帴璐㈡斂鏀粯鎺ュ彛" )
public class PayController extends BaseController {
private final OrderRecordService orderRecordService;
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;
@@ -65,6 +70,7 @@
//鐢熸垚鐢靛瓙缂存鐮�
@PostMapping("zhiFa")
+ @Operation(summary = "鎵ф硶鐢熸垚缂存鐮�" , description = "鎵ф硶鐢熸垚缂存鐮�" )
public Object zhiFa(Long id){
Ticket ticket = ticketService.getById(id);
if(ticket.getPayStatus()==1){
@@ -166,6 +172,7 @@
//鏀粯鎺ュ彛閫氱煡
@PostMapping("result")
+ @Operation(summary = "缂磋垂缁撴灉閫氱煡" , description = "缂磋垂缁撴灉閫氱煡" )
public String result(HttpServletRequest request, String payKey, String payerTypeCode, String payerNum, String payCode, Double amt, String status, String errorInfo, String sign, String signType) throws Exception{
try {
// updateOrderRecord(payCode,status);
@@ -177,6 +184,7 @@
//鐢熸垚鐢靛瓙缂存鐮�
@PostMapping("park2")
+ @Operation(summary = "璐㈡斂缂磋垂鏇存柊鐢熸垚缂存鐮�" , description = "璐㈡斂缂磋垂鏇存柊鐢熸垚缂存鐮�" )
public Object park2(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
@@ -275,6 +283,7 @@
* 缂存涔�
*/
@PostMapping("park")
+ @Operation(summary = "瀵规帴閭偍鐢熸垚缂存涔�" , description = "瀵规帴閭偍鐢熸垚缂存涔�" )
public Object park(Long id){
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
String logs = sdf.format(new Date())+"寮�濮嬫壂鐮佺即璐�------銆媆n";
@@ -387,6 +396,7 @@
* 鑾峰彇鎵ф硶id
*/
@PostMapping("getZhifaId")
+ @Operation(summary = "鏇存柊澶у巺缂存鐮�" , description = "鏇存柊澶у巺缂存鐮�" )
public Object getZhifaId(){
QueryWrapper<NowPayOrder> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -405,6 +415,7 @@
* 缂存涔�
*/
@PostMapping("zhifa")
+ @Operation(summary = "鎵ф硶缂磋垂锛堟柊锛�" , description = "鎵ф硶缂磋垂锛堟柊锛�" )
public Object zhifa(Long id){
System.out.println(id+"寮�濮嬬即璐�");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
@@ -417,9 +428,9 @@
writeTxt(logs);
return R.failed("鏈綒鍗曟棤闇�鏀粯璐圭敤");
}
- if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getStatus() == 0){
+ if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getPayStatus() == 0){
return R.ok("鐢熸垚鐢靛瓙缃氬崟缂存鐮�", "https://hbfs.govpay.ccb.com/online/fssm?fee=130000000001&PyfScnCgycd=01&pyfTpcd=3&BNo="+ticket.getPayCode());
- }else if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getStatus() == 1){
+ }else if(StringUtils.isNotBlank(ticket.getPayCode()) && ticket.getPayStatus() == 1){
return R.failed("宸茬即璐�");
}
if(StringUtils.isBlank(ticket.getPayCode())){
@@ -540,6 +551,12 @@
if(status.equals("03")){
ticket.setPayStatus(1);
dealCar(ticket.getCarNo());
+ if(StringUtils.isBlank(ticket.getNumber()) || "--".equals(ticket.getNumber())){
+ ticket = ticketService.getNumber(ticket);
+ ticket.setPush(0);
+ ticketService.uploadInfo(ticket);
+ return;
+ }
}
if(status.equals("04")||status.equals("05")||status.equals("06")){
ticket.setPayStatus(2);
@@ -561,9 +578,13 @@
wrapper1.lambda()
.eq(TicketBlack::getCarNo,carNo);
List<TicketBlack> all = ticketBlackService.list(wrapper1);
- for(TicketBlack ticketBlack:all){
- ticketBlack.setStatus(1);
- ticketBlack.setBlackType(0);
+ if(all.size()>0){
+ TicketBlack ticketBlack = all.get(0);
+ ticketBlack.setViolationCount(ticketBlack.getViolationCount() == 0?0:ticketBlack.getViolationCount() - 1);
+ if(ticketBlack.getIsActive() == 0){
+ ticketBlack.setStatus(1);
+ ticketBlack.setBlackType(0);
+ }
ticketBlackService.saveOrUpdate(ticketBlack);
}
}
--
Gitblit v1.9.1