From 06e2aef6f1fcee36ce19f60dadd8200b2dddb00b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:21:26 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/config/application.yml | 13 +++++++------
zq-erp/src/test/java/com/matrix/DataMoveTest.java | 4 ++--
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
index 08800f8..9676262 100644
--- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
@@ -1515,7 +1515,7 @@
@Transactional(rollbackFor = Exception.class)
public void tyOrderAndAchieveMove() {
- jdbcTemplate.update("update sys_order set order_type=1, is_has_refund=2 where 1=1");
+ jdbcTemplate.update("update sys_order set orderType=1, is_has_refund=2 where 1=1");
List<SysOrderFlow> flows = sysOrderFlowDao.selectOrderFlowByType();
if (CollUtil.isNotEmpty(flows)) {
diff --git a/zq-erp/src/main/resources/config/application.yml b/zq-erp/src/main/resources/config/application.yml
index 251b16b..d062323 100644
--- a/zq-erp/src/main/resources/config/application.yml
+++ b/zq-erp/src/main/resources/config/application.yml
@@ -21,13 +21,14 @@
strict: false
datasource:
master:
- url: jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
- username: ct_test
- password: 123456
+# url: jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+# username: ct_test
+# password: 123456
+# driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+ username: hive
+ password: hive123!@#
driver-class-name: com.mysql.jdbc.Driver
-#spring.datasource.username=hive
-#spring.datasource.password=hive123!@#
-#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
slave:
url: jdbc:mysql://47.111.134.136:3306/db_meidu8300?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username: meidu_data
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index 5f73b50..4ccb5ff 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -147,8 +147,8 @@
dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
}
-
+ @Test
public void tyOrderAndAchieveDataTest() {
-
+ dataMove.tyOrderAndAchieveMove();
}
}
--
Gitblit v1.9.1