From 78d4f55a5286144e98d84b6a88c82a7541c4575e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 十月 2023 14:03:53 +0800
Subject: [PATCH] 111
---
server/services/src/main/resources/application-dev.yml | 4 ++--
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 1 +
server/web/src/main/resources/application.yml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 7f6f0be..189e8c6 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -659,6 +659,7 @@
.selectAs(BaseParam::getName,MemberRides::getParamName)
.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
.eq(MemberRides::getOrdreId,id)
+ .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey())
.orderByDesc(MemberRides::getCreateDate));
if (!CollectionUtils.isEmpty(memberRides)){
//棰勮缁撶畻浠锋牸鍜岃绠楁椂闀�
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 5f66561..38a3e17 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -50,8 +50,8 @@
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
# notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
- keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
-# keyPath: /usr/local/apiclient_cert.p12
+# keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
+ keyPath: /usr/local/apiclient_cert.p12
########################mqtt鐩稿叧閰嶇疆########################
mqtt:
host: tcp://175.27.187.84:1883
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index 8664b05..05e2417 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -9,7 +9,7 @@
# application:
# name: parkbike
profiles:
- active: dev
+ active: test
# JSON杩斿洖閰嶇疆
jackson:
# 榛樿鏃跺尯
--
Gitblit v1.9.3