修改短信话术 修改 修改工会卡终端号

hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java

@@ -221,10 +221,15 @@ public class OutRechargeOrderController {
 
             Map<String, Object> map = new HashMap<>();
 
+
             if (companyId != null) {
                 map.put("companyId", companyId);
             } else if (userInfoModel.getSecRole().getRoleType() != 1){
-                map.put("companyId", userInfoModel.getBsCompany().getId());
+                if (userInfoModel.getSecRole().getRoleType() == 7) {
+                    map.put("companyId", 23);
+                } else {
+                    map.put("companyId", userInfoModel.getBsCompany().getId());
+                }
             }
             map.put("rechargeStatus", rechargeStatus);
             map.put("payStatus", payStatus);

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -418,19 +418,19 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
 
 
         if (MapUtils.getLong(map, "createTimeS") != null) {
-            map.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeS")), "yyyy-MM-dd HH:mm:ss"));
+            map.put("createTimeS", MapUtils.getString(map, "createTimeS"));
         }
 
         if (MapUtils.getLong(map, "createTimeE") != null) {
-            map.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeE")), "yyyy-MM-dd HH:mm:ss"));
+            map.put("createTimeE", MapUtils.getString(map, "createTimeE"));
         }
 
         if (MapUtils.getLong(map, "payTimeS") != null) {
-            map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
+            map.put("payTimeS", MapUtils.getString(map, "payTimeS"));
         }
 
         if (MapUtils.getLong(map, "payTimeE") != null) {
-            map.put("payTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeE")), "yyyy-MM-dd HH:mm:ss"));
+            map.put("payTimeE", MapUtils.getString(map, "payTimeE"));
         }
 
         return outRechargeOrderMapper.selectOrderCount(map);

v1/target/classes/application.yml

@@ -9,9 +9,9 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    username: hsg
+    username: root
-    password: HUfukeji123456!@#
+    password: HF123456.
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat
@@ -29,38 +29,20 @@ spring:
     maxOpenPreparedStatements: 20
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 139.159.177.244
     port: 36379
     password: HF123456.Redis
-    timeout: 1000
+    timeout: 36000000
     jedis:
       pool:
         max-active: 20
         max-wait: -1
         max-idle: 10
         min-idle: 0
-  #thymelea模板配置
-  thymeleaf:
-    prefix: classpath:/templates/
-    suffix: .html
-    mode: HTML5
-    encoding: UTF-8
-    #热部署文件，页面不产生缓存，及时更新
-    cache: false
   #配置日期返回至前台为时间戳
   jackson:
     serialization:
       write-dates-as-timestamps: true
-
-
-    thymeleaf:
-      cache: false
-      prefix: classpath:/templates/
-      suffix: .html
-      encoding: UTF-8
-      content-type: text/html
-      mode: HTML5
-
 mybatis:
   mapperLocations:
   - classpath*:sqlmap*/*.xml

v1/target/classes/logback.xml

@@ -7,7 +7,7 @@
         </encoder>    
     </appender>    
     <appender name="baselog"    
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">    
         <File>log/base.log</File>    
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">    
             <fileNamePattern>log/base.log.%d.%i</fileNamePattern>    
@@ -41,7 +41,7 @@
         </encoder>
     </appender>
     <appender name="errorlog"    
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        class="ch.qos.logback.core.rolling.RollingFileAppender">    
         <File>log/error.log</File>    
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">    
             <fileNamePattern>log/error.log.%d.%i</fileNamePattern>