From 1b3ca354db52c3683cd37324c3d689dd80d8e903 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 2 Apr 2025 13:36:00 +0800 Subject: [PATCH] this is 4.2 update --- .../service/order/impl/ClothesRentOrderServiceImpl.java | 2 +- src/main/resources/application-dev.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java b/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java index 2317543..c58092c 100644 --- a/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java +++ b/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java @@ -114,7 +114,7 @@ public class ClothesRentOrderServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.in(OrderStatusConstant.PENDING_SHIPMENT, OrderStatusConstant.PENDING_DELIVERY); + queryWrapper.in("orderStatus", OrderStatusConstant.PENDING_SHIPMENT, OrderStatusConstant.PENDING_DELIVERY); List clothesRentOrderList = this.list(queryWrapper); for (ClothesRentOrder clothesRentOrder : clothesRentOrderList) { Long clothesSnapshotId = clothesRentOrder.getClothesSnapshot().getId(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 3a2a46f..147af34 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,5 +1,12 @@ spring: 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 url: jdbc:mysql://123.249.108.160:3306/feiyi-sc?serverTimezone=Asia/Shanghai