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 { " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", " and b.order_status in (#{map.orderStatus}) ", + " = #{map.createTimeS} ]]> ", + " ", " = #{map.payTimeS} ]]> ", " ", " GROUP BY a.id" + @@ -185,6 +187,8 @@ public interface HighOrderMapperExt { " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", " and b.order_status in (#{map.orderStatus}) ", + " = #{map.createTimeS} ]]> ", + " ", " = #{map.payTimeS} ]]> ", " ", " GROUP BY a.id ORDER BY b.create_time desc" + @@ -234,6 +238,8 @@ public interface HighOrderMapperExt { " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", " and b.order_status in (#{map.orderStatus}) ", + " = #{map.createTimeS} ]]> ", + " ", " = #{map.payTimeS} ]]> ", " ", " GROUP BY a.id ORDER BY b.create_time desc" + @@ -284,6 +290,8 @@ public interface HighOrderMapperExt { " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", " and b.order_status in (#{map.orderStatus}) ", + " = #{map.createTimeS} ]]> ", + " ", " = #{map.payTimeS} ]]> ", " ", " GROUP BY a.id ORDER BY b.create_time desc" + @@ -333,6 +341,8 @@ public interface HighOrderMapperExt { " and b.pay_model = #{map.payModel} ", " and b.pay_type = #{map.payType} ", " and b.order_status in (#{map.orderStatus}) ", + " = #{map.createTimeS} ]]> ", + " ", " = #{map.payTimeS} ]]> ", " ", " 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 getGoodsOrderModelList(Map 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 getGasOrderModelList(Map 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 getKfcOrderModelList(Map 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 getCinemaOrderList(Map 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 getMobileOrderList(Map 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")); }