admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

this is 4.2 update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-04-02 13:36:00 +08:00
parent c4e1d506ca
commit 1b3ca354db
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java
View File

@ -114,7 +114,7 @@ public class ClothesRentOrderServiceImpl extends ServiceImpl<ClothesRentOrderMap
@Override @Override
public void validIsBeenRented(Long clothesId) { public void validIsBeenRented(Long clothesId) {
QueryWrapper<ClothesRentOrder> queryWrapper = new QueryWrapper<>(); QueryWrapper<ClothesRentOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.in(OrderStatusConstant.PENDING_SHIPMENT, OrderStatusConstant.PENDING_DELIVERY); queryWrapper.in("orderStatus", OrderStatusConstant.PENDING_SHIPMENT, OrderStatusConstant.PENDING_DELIVERY);
List<ClothesRentOrder> clothesRentOrderList = this.list(queryWrapper); List<ClothesRentOrder> clothesRentOrderList = this.list(queryWrapper);
for (ClothesRentOrder clothesRentOrder : clothesRentOrderList) { for (ClothesRentOrder clothesRentOrder : clothesRentOrderList) {
Long clothesSnapshotId = clothesRentOrder.getClothesSnapshot().getId(); Long clothesSnapshotId = clothesRentOrder.getClothesSnapshot().getId();

7
src/main/resources/application-dev.yml
View File

@ -1,5 +1,12 @@
spring: spring:
datasource: datasource:
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://154.8.193.216:3306/feiyi?serverTimezone=Asia/Shanghai
# username: feiyi
# password: 123456asd
# hikari:
# maximum-pool-size: 20
# max-lifetime: 120000
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://123.249.108.160:3306/feiyi-sc?serverTimezone=Asia/Shanghai url: jdbc:mysql://123.249.108.160:3306/feiyi-sc?serverTimezone=Asia/Shanghai