合并话费修改

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

@@ -51,6 +51,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.IntFunction;
 
 @Controller
 @RequestMapping(value = "/outRechargeOrder")
@@ -134,6 +135,7 @@ public class OutRechargeOrderController {
             @RequestParam(name = "payStatus", required = false) Integer payStatus,
             @RequestParam(name = "rechargeStatus", required = false) String rechargeStatus,
             @RequestParam(name = "orderNo", required = false) String orderNo,
+            @RequestParam(name = "companyId", required = false) Long companyId,
             @RequestParam(name = "operatorType", required = false) String operatorType,
             @RequestParam(name = "laborUnionCard", required = false) String laborUnionCard,
             @RequestParam(name = "rechargeContent", required = false) String rechargeContent,
@@ -154,7 +156,16 @@ public class OutRechargeOrderController {
 
             Map<String, Object> map = new HashMap<>();
 
+            if (companyId != null) {
+                map.put("companyId", companyId);
+            } else if (userInfoModel.getSecRole().getRoleType() != 1){
+                if (userInfoModel.getSecRole().getRoleType() == 7) {
+                    map.put("companyId", 23);
+                } else {
                     map.put("companyId", userInfoModel.getBsCompany().getId());
+                }
+            }
+
             map.put("rechargeStatus", rechargeStatus);
             map.put("payStatus", payStatus);
             map.put("orderNo", orderNo);
@@ -189,6 +200,7 @@ public class OutRechargeOrderController {
     public ResponseData exportOrderList(
             @RequestParam(name = "payStatus", required = false) Integer payStatus,
             @RequestParam(name = "rechargeStatus", required = false) String rechargeStatus,
+            @RequestParam(name = "companyId", required = false) Long companyId,
             @RequestParam(name = "orderNo", required = false) String orderNo,
             @RequestParam(name = "operatorType", required = false) String operatorType,
             @RequestParam(name = "laborUnionCard", required = false) String laborUnionCard,
@@ -209,7 +221,11 @@ 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());
+            }
             map.put("rechargeStatus", rechargeStatus);
             map.put("payStatus", payStatus);
             map.put("orderNo", orderNo);

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java

@@ -134,7 +134,7 @@ public interface OutRechargeOrderMapperExt {
     @Select(value = {
             "<script>",
             "select sum(order_price) orderPrice, sum(pay_real_price)  payRealPrice , count(*) count ",
-            "from out_recharge_order where pay_status in (2,3) and Identification_code = #{code}",
+            "from out_recharge_order where pay_status in (102,100) and company_id = 23",
             "</script>"
     })
     @Results({

v1/target/classes/application.yml

@@ -9,9 +9,9 @@ debug: false
 #datasource数据源设置
 spring:
   datasource:
-    url: jdbc:mysql://139.159.177.244:3306/hfkj?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.0.63:21100/hsg?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-    username: root
+    username: hsg
-    password: HF123456.
+    password: HUfukeji123456!@#
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     filters: stat
@@ -29,20 +29,38 @@ spring:
     maxOpenPreparedStatements: 20
   redis:
     database: 0
-    host: 139.159.177.244
+    host: 127.0.0.1
     port: 36379
     password: HF123456.Redis
-    timeout: 36000000
+    timeout: 1000
     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