From 8e760b89ba644ef40a0c36427023138233ddab65 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 05 九月 2023 16:50:43 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/controller/phone/TicketController.java | 15 ++++++++-------
src/main/java/com/boying/controller/phone/PayController.java | 6 ++++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/PayController.java b/src/main/java/com/boying/controller/phone/PayController.java
index d2dcca6..402aa13 100644
--- a/src/main/java/com/boying/controller/phone/PayController.java
+++ b/src/main/java/com/boying/controller/phone/PayController.java
@@ -540,6 +540,12 @@
if(status.equals("03")){
ticket.setPayStatus(1);
dealCar(ticket.getCarNo());
+ if(StringUtils.isNotBlank(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);
diff --git a/src/main/java/com/boying/controller/phone/TicketController.java b/src/main/java/com/boying/controller/phone/TicketController.java
index bdb9adf..1bf0858 100644
--- a/src/main/java/com/boying/controller/phone/TicketController.java
+++ b/src/main/java/com/boying/controller/phone/TicketController.java
@@ -205,6 +205,13 @@
String s = NumberToCN.number2CNMontrayUnit(numberOfMoney);
ticket.setMoneyStr(s.toString());
}
+ 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("寮犲噣闆�");
@@ -213,13 +220,7 @@
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 = ticketService.getNumber(ticket);
- ticket.setPush(0);
- ticketService.uploadInfo(ticket);
- }else {
- ticketService.updateById(ticket);
- }
+ ticketService.updateById(ticket);
return R.ok();
}
--
Gitblit v1.9.1