From 1f257db0a97b5beb71e8ff3c14fda603bf2b4004 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 十二月 2023 15:13:27 +0800
Subject: [PATCH] 服务商
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 1 +
server/services/src/main/resources/mappers/SystemDictDataMapper.xml | 2 +-
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 2 +-
server/services/src/main/resources/application-pro.yml | 5 ++---
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 4f8c93d..92ffb41 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -70,7 +70,7 @@
* 娓│
* @throws Exception
*/
- @Scheduled(cron = "0 30 13 * * ? ")
+ @Scheduled(cron = "0 0 21 * * ? ")
public void getYesterdayBill() throws Exception {
log.info("=====================寮�濮嬫瘡澶╄嚜鍔ㄧ粨绠�=======================");
goodsorderService.autoCloseOrder();
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index d3fd0bd..f57abb7 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -218,6 +218,7 @@
body.put("scene", locks.getSiteId() + "/" +locks.getCode() );
// 姝ｅ紡鐗堜负 "release"锛屼綋楠岀増涓� "trial"锛屽紑鍙戠増涓� "develop"銆傞粯璁ゆ槸姝ｅ紡鐗堛��
body.put("env_version", "release");
+ body.put("env_version", "trial");
// 閫忔槑锛屾牴鎹綘鐨勫満鏅嚜琛岃缃産ody鍙傛暟
body.put("is_hyaline", false);
body.put("check_path", false);
diff --git a/server/services/src/main/resources/application-pro.yml b/server/services/src/main/resources/application-pro.yml
index 5132499..557bfd1 100644
--- a/server/services/src/main/resources/application-pro.yml
+++ b/server/services/src/main/resources/application-pro.yml
@@ -47,8 +47,8 @@
mchId: 1661770902
apiV3Key: iF3kC8pL8dZ9iU3hN5fX9zI6eF4xQ6fT
serialNumer: 368B835A194384FD583B83B77977B84127D2F655
- notifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/wxPayNotify
- refundNotifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/wxRefundNotify
+ notifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/api/wxPayNotify
+ refundNotifyUrl: https://bikes.yxbhlt.cn/bike_h5_api/api/wxRefundNotify
# notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
keyPath: /usr/local/parks/cert/apiclient_cert.p12
privateCertPath: /usr/local/parks/cert/apiclient_cert.pem
@@ -76,5 +76,4 @@
map:
remoteHost: https://apis.map.qq.com
appKey: 3AYBZ-I5R3V-2BVP3-UWBDQ-ETBM5-B2BBQ
-
diff --git a/server/services/src/main/resources/mappers/SystemDictDataMapper.xml b/server/services/src/main/resources/mappers/SystemDictDataMapper.xml
index 7227845..ddc8220 100644
--- a/server/services/src/main/resources/mappers/SystemDictDataMapper.xml
+++ b/server/services/src/main/resources/mappers/SystemDictDataMapper.xml
@@ -18,7 +18,7 @@
</resultMap>
<select id="selectManageList" parameterType="com.doumee.dao.system.dto.QuerySystemDictDataDTO" resultMap="SystemDictDataListVO">
select
- dict_data.id, dict_data.dict_id, dict_data.code, dict_data.label, dict_data.sort, dict_data.disabled, dict_data.create_time, dict_data.update_time, dict_data.create_user, dict_data.update_user,
+ dict_data.id,dict_data.info, dict_data.dict_id, dict_data.code, dict_data.label, dict_data.sort, dict_data.disabled, dict_data.create_time, dict_data.update_time, dict_data.create_user, dict_data.update_user,
create_user.id create_user_id, create_user.username create_user_name,create_user.realname create_real_name,
update_user.id updete_user_id, update_user.username update_user_name,update_user.realname update_real_name
from system_dict_data dict_data
--
Gitblit v1.9.3