From 957fe0a4eda7e4616d91d0b8939901bff6366542 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 05 六月 2023 23:56:51 +0800
Subject: [PATCH] 修改
---
src/main/java/com/boying/service/impl/EnterParkServiceImpl.java | 16 ++++++++++++++++
src/main/java/com/boying/entity/OrderRecord.java | 4 ++--
src/main/java/com/boying/service/EnterParkService.java | 3 +++
src/main/java/com/boying/controller/phone/YCPayController.java | 8 ++++++++
4 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/boying/controller/phone/YCPayController.java b/src/main/java/com/boying/controller/phone/YCPayController.java
index 6eb5003..a4f7935 100644
--- a/src/main/java/com/boying/controller/phone/YCPayController.java
+++ b/src/main/java/com/boying/controller/phone/YCPayController.java
@@ -40,6 +40,7 @@
private final TicketBlackService ticketBlackService;
private final SystemConfigProperties systemConfigProperties;
private final WhiteListService whiteListService;
+ private final EnterParkService enterParkService;
/**
* 鏌ヨ璁㈠崟鎺ュ彛
@@ -261,6 +262,13 @@
orderRecord.setTicketStatus(0);
orderRecord.setPayCode(outPark.getPayCode());
orderRecordService.saveOrUpdate(orderRecord);
+ if(outPark.getImgId() != null){
+ orderRecord.setImgOutId(outPark.getImgId());
+ }
+ EnterPark enterPark = enterParkService.getByCarNoAndDate(outPark.getCarNo(), outPark.getParkId(), outPark.getEnterTime());
+ if(enterPark != null && enterPark.getImgId() != null){
+ orderRecord.setImgInId(enterPark.getImgId());
+ }
}
//鎻掑叆鎵ф硶璁㈠崟璁板綍
diff --git a/src/main/java/com/boying/entity/OrderRecord.java b/src/main/java/com/boying/entity/OrderRecord.java
index c4959a9..3b6f298 100644
--- a/src/main/java/com/boying/entity/OrderRecord.java
+++ b/src/main/java/com/boying/entity/OrderRecord.java
@@ -107,12 +107,12 @@
//鍥剧墖id
@ApiModelProperty(value = "鍏ュ満鍥剧墖id")
@Column(columnDefinition = "int comment '鍏ュ満鍥剧墖id'")
- private Long imgInId;
+ private Integer imgInId;
//鍥剧墖id
@ApiModelProperty(value = "鍑哄満鍥剧墖id")
@Column(columnDefinition = "int comment '鍑哄満鍥剧墖id'")
- private Long imgOutId;
+ private Integer imgOutId;
@Transient
@TableField(exist = false)
diff --git a/src/main/java/com/boying/service/EnterParkService.java b/src/main/java/com/boying/service/EnterParkService.java
index b182fb2..63829cc 100644
--- a/src/main/java/com/boying/service/EnterParkService.java
+++ b/src/main/java/com/boying/service/EnterParkService.java
@@ -4,6 +4,7 @@
import com.boying.entity.EnterPark;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -23,4 +24,6 @@
List<EnterPark> findByCarNo(String carNo,Integer parkId);
@Transactional(readOnly = false)
void deleteByCarNo(String carNo,Integer parkId);
+
+ EnterPark getByCarNoAndDate(String carNo, Integer parkId, LocalDateTime dateTime);
}
diff --git a/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java b/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java
index 1b9e7a2..b398fa8 100644
--- a/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java
+++ b/src/main/java/com/boying/service/impl/EnterParkServiceImpl.java
@@ -12,6 +12,7 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -64,4 +65,19 @@
enterParkMapper.delete(wrapper);
}
+
+ @Override
+ public EnterPark getByCarNoAndDate(String carNo, Integer parkId, LocalDateTime dateTime) {
+ QueryWrapper<EnterPark> wrapper = new QueryWrapper<>();
+ wrapper.lambda()
+ .eq(EnterPark::getCarNo,carNo)
+ .eq(EnterPark::getParkId,parkId)
+ .eq(EnterPark::getCreateTime,dateTime);
+ List<EnterPark> enterParks = enterParkMapper.selectList(wrapper);
+ if(enterParks.size()>0){
+ return enterParks.get(0);
+ }else {
+ return null;
+ }
+ }
}
--
Gitblit v1.9.1