Helius
2021-04-19 06e2aef6f1fcee36ce19f60dadd8200b2dddb00b
modify
3 files modified
19 ■■■■ changed files
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java 2 ●●● patch | view | raw | blame | history
zq-erp/src/main/resources/config/application.yml 13 ●●●● patch | view | raw | blame | history
zq-erp/src/test/java/com/matrix/DataMoveTest.java 4 ●●●● patch | view | raw | blame | history
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)) {
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
zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -147,8 +147,8 @@
        dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
    }
    @Test
    public void tyOrderAndAchieveDataTest() {
        dataMove.tyOrderAndAchieveMove();
    }
}