From 4d5a46b87e1455976ebd727e4f99be04e22a73cc Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 29 Jul 2021 23:02:26 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bweb/controller/HighOrderController.java  | 24 +++++++++++
 .../java/com/hai/dao/HighOrderMapperExt.java  | 10 +++++
 .../service/impl/HighOrderServiceImpl.java    | 41 +++++++++++++++++++
 3 files changed, 75 insertions(+)

diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
index 88ef83c0..cc4f8ae6 100644
--- a/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
+++ b/hai-bweb/src/main/java/com/bweb/controller/HighOrderController.java
@@ -153,6 +153,8 @@ public class HighOrderController {
                                           @RequestParam(name = "payModel", required = false) Integer payModel,
                                           @RequestParam(name = "payType", required = false) Integer payType,
                                           @RequestParam(name = "orderStatus", required = false) Integer orderStatus,
+                                          @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                          @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                           @RequestParam(name = "payTimeS", required = false) Long payTimeS,
                                           @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                           @RequestParam(name = "pageNum", required = true) Integer pageNum,
@@ -181,6 +183,8 @@ public class HighOrderController {
             map.put("payModel", payModel);
             map.put("payType", payType);
             map.put("orderStatus", orderStatus);
+            map.put("createTimeS", createTimeS);
+            map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);
             map.put("payTimeE", payTimeE);
 
@@ -203,6 +207,8 @@ public class HighOrderController {
                                              @RequestParam(name = "payModel", required = false) Integer payModel,
                                              @RequestParam(name = "payType", required = false) Integer payType,
                                              @RequestParam(name = "orderStatus", required = false) Integer orderStatus,
+                                             @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                             @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                              @RequestParam(name = "payTimeS", required = false) Long payTimeS,
                                              @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                              HttpServletRequest request) {
@@ -228,6 +234,8 @@ public class HighOrderController {
             map.put("payModel", payModel);
             map.put("payType", payType);
             map.put("orderStatus", orderStatus);
+            map.put("createTimeS", createTimeS);
+            map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);
             map.put("payTimeE", payTimeE);
 
@@ -254,6 +262,8 @@ public class HighOrderController {
                                           @RequestParam(name = "payModel", required = false) Integer payModel,
                                           @RequestParam(name = "payType", required = false) Integer payType,
                                           @RequestParam(name = "orderStatus", required = false) Integer orderStatus,
+                                          @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                          @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                           @RequestParam(name = "payTimeS", required = false) Long payTimeS,
                                           @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                           @RequestParam(name = "pageNum", required = true) Integer pageNum,
@@ -282,6 +292,8 @@ public class HighOrderController {
             map.put("payModel", payModel);
             map.put("payType", payType);
             map.put("orderStatus", orderStatus);
+            map.put("createTimeS", createTimeS);
+            map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);
             map.put("payTimeE", payTimeE);
 
@@ -304,6 +316,8 @@ public class HighOrderController {
                                         @RequestParam(name = "payModel", required = false) Integer payModel,
                                         @RequestParam(name = "payType", required = false) Integer payType,
                                         @RequestParam(name = "orderStatus", required = false) Integer orderStatus,
+                                        @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                        @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                         @RequestParam(name = "payTimeS", required = false) Long payTimeS,
                                         @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                         @RequestParam(name = "pageNum", required = true) Integer pageNum,
@@ -332,6 +346,8 @@ public class HighOrderController {
             map.put("payModel", payModel);
             map.put("payType", payType);
             map.put("orderStatus", orderStatus);
+            map.put("createTimeS", createTimeS);
+            map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);
             map.put("payTimeE", payTimeE);
 
@@ -354,6 +370,8 @@ public class HighOrderController {
                                         @RequestParam(name = "payModel", required = false) Integer payModel,
                                         @RequestParam(name = "payType", required = false) Integer payType,
                                         @RequestParam(name = "orderStatus", required = false) Integer orderStatus,
+                                        @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                        @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                         @RequestParam(name = "payTimeS", required = false) Long payTimeS,
                                         @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                         @RequestParam(name = "pageNum", required = true) Integer pageNum,
@@ -382,6 +400,8 @@ public class HighOrderController {
             map.put("payModel", payModel);
             map.put("payType", payType);
             map.put("orderStatus", orderStatus);
+            map.put("createTimeS", createTimeS);
+            map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);
             map.put("payTimeE", payTimeE);
 
@@ -404,6 +424,8 @@ public class HighOrderController {
                                            @RequestParam(name = "payModel", required = false) Integer payModel,
                                            @RequestParam(name = "payType", required = false) Integer payType,
                                            @RequestParam(name = "orderStatus", required = false) Integer orderStatus,
+                                           @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                           @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                            @RequestParam(name = "payTimeS", required = false) Long payTimeS,
                                            @RequestParam(name = "payTimeE", required = false) Long payTimeE,
                                            @RequestParam(name = "pageNum", required = true) Integer pageNum,
@@ -432,6 +454,8 @@ public class HighOrderController {
             map.put("payModel", payModel);
             map.put("payType", payType);
             map.put("orderStatus", orderStatus);
+            map.put("createTimeS", createTimeS);
+            map.put("createTimeE", createTimeE);
             map.put("payTimeS", payTimeS);
             map.put("payTimeE", payTimeE);
 
diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
index e8a85490..01bf2640 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
@@ -134,6 +134,8 @@ public interface HighOrderMapperExt {
             " <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>",
             " <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>",
             " <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>",
+            " <if test='map.createTimeS != null'> <![CDATA[ and b.create_time >= #{map.createTimeS} ]]> </if>",
+            " <if test='map.createTimeE != null'> <![CDATA[ and b.create_time <= #{map.createTimeE} ]]> </if>",
             " <if test='map.payTimeS != null'> <![CDATA[ and b.pay_time >= #{map.payTimeS} ]]> </if>",
             " <if test='map.payTimeE != null'> <![CDATA[ and b.pay_time <= #{map.payTimeE} ]]> </if>",
             " GROUP BY a.id" +
@@ -185,6 +187,8 @@ public interface HighOrderMapperExt {
             " <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>",
             " <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>",
             " <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>",
+            " <if test='map.createTimeS != null'> <![CDATA[ and b.create_time >= #{map.createTimeS} ]]> </if>",
+            " <if test='map.createTimeE != null'> <![CDATA[ and b.create_time <= #{map.createTimeE} ]]> </if>",
             " <if test='map.payTimeS != null'> <![CDATA[ and b.pay_time >= #{map.payTimeS} ]]> </if>",
             " <if test='map.payTimeE != null'> <![CDATA[ and b.pay_time <= #{map.payTimeE} ]]> </if>",
             " GROUP BY a.id ORDER BY b.create_time desc" +
@@ -234,6 +238,8 @@ public interface HighOrderMapperExt {
             " <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>",
             " <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>",
             " <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>",
+            " <if test='map.createTimeS != null'> <![CDATA[ and b.create_time >= #{map.createTimeS} ]]> </if>",
+            " <if test='map.createTimeE != null'> <![CDATA[ and b.create_time <= #{map.createTimeE} ]]> </if>",
             " <if test='map.payTimeS != null'> <![CDATA[ and b.pay_time >= #{map.payTimeS} ]]> </if>",
             " <if test='map.payTimeE != null'> <![CDATA[ and b.pay_time <= #{map.payTimeE} ]]> </if>",
             " GROUP BY a.id ORDER BY b.create_time desc" +
@@ -284,6 +290,8 @@ public interface HighOrderMapperExt {
             " <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>",
             " <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>",
             " <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>",
+            " <if test='map.createTimeS != null'> <![CDATA[ and b.create_time >= #{map.createTimeS} ]]> </if>",
+            " <if test='map.createTimeE != null'> <![CDATA[ and b.create_time <= #{map.createTimeE} ]]> </if>",
             " <if test='map.payTimeS != null'> <![CDATA[ and b.pay_time >= #{map.payTimeS} ]]> </if>",
             " <if test='map.payTimeE != null'> <![CDATA[ and b.pay_time <= #{map.payTimeE} ]]> </if>",
             " GROUP BY a.id ORDER BY b.create_time desc" +
@@ -333,6 +341,8 @@ public interface HighOrderMapperExt {
             " <if test='map.payModel != null'> and b.pay_model = #{map.payModel} </if>",
             " <if test='map.payType != null'> and b.pay_type = #{map.payType} </if>",
             " <if test='map.orderStatus != null'> and b.order_status in (#{map.orderStatus}) </if>",
+            " <if test='map.createTimeS != null'> <![CDATA[ and b.create_time >= #{map.createTimeS} ]]> </if>",
+            " <if test='map.createTimeE != null'> <![CDATA[ and b.create_time <= #{map.createTimeE} ]]> </if>",
             " <if test='map.payTimeS != null'> <![CDATA[ and b.pay_time >= #{map.payTimeS} ]]> </if>",
             " <if test='map.payTimeE != null'> <![CDATA[ and b.pay_time <= #{map.payTimeE} ]]> </if>",
             " GROUP BY a.id ORDER BY b.create_time desc" +
diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
index 40ba8323..6d22740c 100644
--- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
+++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java
@@ -360,6 +360,14 @@ public class HighOrderServiceImpl implements HighOrderService {
     @Override
     public List<HighOrderModel> getGoodsOrderModelList(Map<String, Object> map) throws Exception {
 
+        if(MapUtils.getLong(map, "createTimeS") != null) {
+            map.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeS")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+        if(MapUtils.getLong(map, "createTimeE") != null) {
+            map.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeE")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         if(MapUtils.getLong(map, "payTimeS") != null) {
             map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
         }
@@ -373,6 +381,15 @@ public class HighOrderServiceImpl implements HighOrderService {
 
     @Override
     public List<HighOrderModel> getGasOrderModelList(Map<String, Object> map) throws Exception {
+
+        if(MapUtils.getLong(map, "createTimeS") != null) {
+            map.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeS")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+        if(MapUtils.getLong(map, "createTimeE") != null) {
+            map.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeE")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         if(MapUtils.getLong(map, "payTimeS") != null) {
             map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
         }
@@ -386,6 +403,14 @@ public class HighOrderServiceImpl implements HighOrderService {
 
     @Override
     public List<HighOrderModel> getKfcOrderModelList(Map<String, Object> map) throws Exception {
+        if(MapUtils.getLong(map, "createTimeS") != null) {
+            map.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeS")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+        if(MapUtils.getLong(map, "createTimeE") != null) {
+            map.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeE")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         if(MapUtils.getLong(map, "payTimeS") != null) {
             map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
         }
@@ -399,6 +424,14 @@ public class HighOrderServiceImpl implements HighOrderService {
 
     @Override
     public List<HighOrderModel> getCinemaOrderList(Map<String, Object> map) throws Exception {
+        if(MapUtils.getLong(map, "createTimeS") != null) {
+            map.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeS")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+        if(MapUtils.getLong(map, "createTimeE") != null) {
+            map.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeE")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         if(MapUtils.getLong(map, "payTimeS") != null) {
             map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
         }
@@ -412,6 +445,14 @@ public class HighOrderServiceImpl implements HighOrderService {
 
     @Override
     public List<HighOrderModel> getMobileOrderList(Map<String, Object> map) throws Exception {
+        if(MapUtils.getLong(map, "createTimeS") != null) {
+            map.put("createTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeS")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
+        if(MapUtils.getLong(map, "createTimeE") != null) {
+            map.put("createTimeE", DateUtil.date2String(new Date(MapUtils.getLong(map, "createTimeE")), "yyyy-MM-dd HH:mm:ss"));
+        }
+
         if(MapUtils.getLong(map, "payTimeS") != null) {
             map.put("payTimeS", DateUtil.date2String(new Date(MapUtils.getLong(map, "payTimeS")), "yyyy-MM-dd HH:mm:ss"));
         }