合并话费修改

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

@@ -133,7 +133,10 @@ public class OutRechargeOrderController {
 
             Map<String, Object> map = new HashMap<>();
             map.put("userId", userInfoModel.getHighUser().getId().toString());
+            if (status != null) {
                 map.put("payStatus", status.toString());
+            }
+
             map.put("orderNo", orderNo);
 
             PageHelper.startPage(pageNum, pageSize);

hai-service/src/main/resources/dev/commonConfig.properties

@@ -35,8 +35,8 @@ unionPayChannelid=D01X00000801226
 unionPayMerid=83169055983W000
 unionPayTermid=XS000103
 unionPaySignKey=1dfk0i0fl7ild07l2k5oj8dddikkivd0
-unionPayNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notify
+unionPayNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notify
-unionPayTelNotifyUrl=https://hsg.dctpay.com/crest/unionPay/notifyTel
+unionPayTelNotifyUrl=https://hsgcs.dctpay.com/crest/unionPay/notifyTel
 
 unionStagingPayUrl=https://mtest.eycard.cn/
 unionStagingPayOrgId=ORG000000000001

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