From 29ff257088ed97caf78eb0c480e55f27a7600415 Mon Sep 17 00:00:00 2001 From: YUANYE <418471657@qq.com> Date: Thu, 24 Jun 2021 14:34:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OutRechargeOrderController.java | 8 ++++++++ .../bweb/model/ExportOutRechargeOrderCount.java | 13 +++++++++++++ .../com/hai/dao/OutRechargeOrderMapperExt.java | 15 +++++++++------ .../main/java/com/hai/model/OutOrderModel.java | 10 ++++++++++ .../service/impl/OutRechargeOrderServiceImpl.java | 9 ++++++++- 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java index 7a4dda46..eb8cb99a 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java @@ -314,6 +314,7 @@ public class OutRechargeOrderController { public ResponseData getOrderCountList( @RequestParam(name = "finishTimeS", required = false) Long finishTimeS, @RequestParam(name = "finishTimeE", required = false) Long finishTimeE, + @RequestParam(name = "status", required = false) Integer status, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize, HttpServletRequest request) { @@ -328,6 +329,9 @@ public class OutRechargeOrderController { if (finishTimeE != null){ map.put("finishTimeE", finishTimeE.toString()); } + if (status != null){ + map.put("status", status.toString()); + } PageHelper.startPage(pageNum,pageSize); return ResponseMsgUtil.success(new PageInfo<>(outRechargeOrderService.getListOrderCount(map))); @@ -342,6 +346,7 @@ public class OutRechargeOrderController { @ResponseBody @ApiOperation(value = "导出订单") public ResponseData exportOrderListCount(@RequestParam(name = "finishTimeS", required = false) Long finishTimeS, + @RequestParam(name = "status", required = false) Integer status, @RequestParam(name = "finishTimeE", required = false) Long finishTimeE) { try { @@ -354,6 +359,9 @@ public class OutRechargeOrderController { if (finishTimeE != null){ map.put("finishTimeE", finishTimeE.toString()); } + if (status != null){ + map.put("status", status.toString()); + } List list = outRechargeOrderService.getListOrderCount(map); diff --git a/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrderCount.java b/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrderCount.java index 1a7550ef..673a7ad5 100644 --- a/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrderCount.java +++ b/hai-bweb/src/main/java/com/bweb/model/ExportOutRechargeOrderCount.java @@ -1,6 +1,7 @@ package com.bweb.model; import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.models.auth.In; import java.math.BigDecimal; import java.util.Date; @@ -10,6 +11,9 @@ public class ExportOutRechargeOrderCount { @ExcelProperty("时间") private Date day; + @ExcelProperty("状态") + private Integer status; + @ExcelProperty("数量") private Long count; @@ -19,6 +23,15 @@ public class ExportOutRechargeOrderCount { @ExcelProperty("充值金额") private BigDecimal orderPrice; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Date getDay() { return day; } diff --git a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java index ea9e58f5..e5ab4456 100644 --- a/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java @@ -21,13 +21,15 @@ public interface OutRechargeOrderMapperExt { @Select(value = { "" }) @@ -36,8 +38,9 @@ public interface OutRechargeOrderMapperExt { @Result(column="day", property="day", jdbcType=JdbcType.TIMESTAMP), @Result(column="pay_price", property="payPrice", jdbcType=JdbcType.DECIMAL), @Result(column="order_price", property="orderPrice", jdbcType=JdbcType.DECIMAL), + @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), }) - List getListOrderCount(String finishTimeS , String finishTimeE); + List getListOrderCount(String finishTimeS , String finishTimeE , Integer status); @Select(value = { "" }) List selectOrderCount(@Param("map") Map map); -} \ No newline at end of file +} diff --git a/hai-service/src/main/java/com/hai/model/OutOrderModel.java b/hai-service/src/main/java/com/hai/model/OutOrderModel.java index 5655db83..5bf2c3e2 100644 --- a/hai-service/src/main/java/com/hai/model/OutOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/OutOrderModel.java @@ -18,6 +18,16 @@ public class OutOrderModel { */ private BigDecimal orderPrice; + private Integer status; + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Date getDay() { return day; } diff --git a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java index ff52d061..b6e7fd77 100644 --- a/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java @@ -8,6 +8,7 @@ import com.hai.model.OutOrderModel; import com.hai.model.OutRechargeOrderModel; import com.hai.model.OutUserOrderModel; import com.hai.service.OutRechargeOrderService; +import io.swagger.models.auth.In; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -157,6 +158,12 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { public List getListOrderCount(Map map) throws Exception { String finishTimeS = map.get("finishTimeS"); String finishTimeE = map.get("finishTimeE"); + Integer status; + if (StringUtils.isNotBlank(map.get("status"))) { + status = Integer.valueOf(map.get("status")); + } else { + status = null; + } String fTimeS; String fTimeE; if (StringUtils.isNotBlank(finishTimeS)) { @@ -186,7 +193,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { } else { fTimeE = DateUtil.date2String(new Date(), "yyyy-MM-dd HH:mm:ss"); } - return outRechargeOrderMapperExt.getListOrderCount(fTimeS , fTimeE); + return outRechargeOrderMapperExt.getListOrderCount(fTimeS , fTimeE , status); } @Override