pre 合并 master

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/HighOrderServiceImpl.java

@@ -779,11 +779,11 @@ public class HighOrderServiceImpl implements HighOrderService {
         }
         String goodsDesc = "";
         String tranDesc = "";
-        String instCode = "11101290";
+        String instCode = "11101527";
         String businessType = "hisen_consume";
 
         if (order.getHighChildOrderList().get(0).getGoodsType() == 1) {
-            instCode = "11101291";
+            instCode = "11101526";
             businessType = "sinopec_oil_code";
             goodsDesc = "购买加油券";
             tranDesc = order.getHighChildOrderList().get(0).getGoodsName();

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

@@ -197,10 +197,9 @@ public class HltUnionCardVipServiceImpl implements HltUnionCardVipService {
             HuiLianTongUnionCardConfig.submitSms(phone , "“E信通春节关怀”3张4元话费券、99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。");
         } else {
             if (equityLevel == 1) {
-                HuiLianTongUnionCardConfig.submitSms(phone , "“E信通会员专属”3张4元话费券、2张99折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。");
+                HuiLianTongUnionCardConfig.submitSms(phone , "“E信通会员专属”3张4元话费券、2张96折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。");
             } else {
-
+                HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”2元话费券、2张96折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。");
-                HuiLianTongUnionCardConfig.submitSms(phone , "“工会卡用户专属”2元话费券、5张98折加油券已到账，打开“嗨森逛”微信小程序>我的>我的优惠券即可直接使用，到账之日起1月内（30天）有效。");
             }
         }
 

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);
@@ -526,7 +526,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
 
         String goodsDesc = "充值话费";
         String tranDesc = order.getRechargeContent() + "充值" + order.getPayRealPrice() + "元话费";
-        String instCode = "11101290";
+        String instCode = "11101527";
         String businessType = "hisen_consume";
 
         // 工会卡支付

v1/target/classes/application.yml

@@ -0,0 +1,56 @@
+server:
+  port: 9902
+  servlet:
+    context-path: /v1
+
+#配置是否为debug模式，debug模式下，不开启权限校验
+debug: false
+
+#datasource数据源设置
+spring:
+  datasource:
+    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    username: root
+    password: HF123456.
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat
+    maxActive: 10
+    initialSize: 5
+    maxWait: 60000
+    minIdle: 5
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+  redis:
+    database: 0
+    host: 139.159.177.244
+    port: 36379
+    password: HF123456.Redis
+    timeout: 36000000
+    jedis:
+      pool:
+        max-active: 20
+        max-wait: -1
+        max-idle: 10
+        min-idle: 0
+  #配置日期返回至前台为时间戳
+  jackson:
+    serialization:
+      write-dates-as-timestamps: true
+mybatis:
+  mapperLocations:
+  - classpath*:sqlmap*/*.xml
+  type-aliases-package:
+    org.springboot.sample.entity
+
+pagehelper:
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql

v1/target/classes/logback.xml

@@ -0,0 +1,72 @@
+<configuration>    
+    <!-- %m输出的信息,%p日志级别,%t线程名,%d日期,%c类的全名,,,, -->    
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">    
+        <encoder>    
+            <pattern>%d %p (%file:%line\)- %m%n</pattern>  
+            <charset>UTF-8</charset>   
+        </encoder>    
+    </appender>    
+    <appender name="baselog"    
+        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>    
+            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">    
+                <!-- or whenever the file size reaches 64 MB -->    
+                <maxFileSize>64 MB</maxFileSize>    
+            </timeBasedFileNamingAndTriggeringPolicy>    
+        </rollingPolicy>    
+        <encoder>    
+            <pattern>    
+                %d %p (%file:%line\)- %m%n  
+            </pattern>    
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->   
+        </encoder>    
+    </appender>
+    <appender name="daolog"
+              class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <File>log/dao.log</File>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>log/dao.log.%d.%i</fileNamePattern>
+            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <!-- or whenever the file size reaches 64 MB -->
+                <maxFileSize>64 MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder>
+            <pattern>
+                %d %p (%file:%line\)- %m%n
+            </pattern>
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
+        </encoder>
+    </appender>
+    <appender name="errorlog"    
+        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>    
+            <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">    
+                <!-- or whenever the file size reaches 64 MB -->    
+                <maxFileSize>64 MB</maxFileSize>    
+            </timeBasedFileNamingAndTriggeringPolicy>    
+        </rollingPolicy>    
+        <encoder>    
+            <pattern>    
+                %d %p (%file:%line\)- %m%n  
+            </pattern>    
+            <charset>UTF-8</charset> <!-- 此处设置字符集 -->   
+        </encoder>    
+    </appender>    
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT" />    
+    </root>    
+    <logger name="com.hai" level="DEBUG">
+        <appender-ref ref="baselog" />   
+    </logger>
+    <logger name="com.hai.dao" level="DEBUG">
+        <appender-ref ref="daolog" />
+    </logger>
+    <logger name="com.hai" level="ERROR">
+        <appender-ref ref="errorlog" />   
+    </logger>
+</configuration>