From 8c2d32e7d911c1cc38e59945aa5b73934ecb8273 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Thu, 2 Jun 2022 10:52:22 +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 --- .../HighTyAgentOilStationController.java | 18 ++++++++++++++++++ .../dao/HighTyAgentOilStationMapperExt.java | 3 +++ .../main/java/com/hai/model/TyOrderModel.java | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java index a2a3531a..71aa8de2 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/HighTyAgentOilStationController.java @@ -341,6 +341,7 @@ public class HighTyAgentOilStationController { @RequestParam(name = "memPhone", required = false) String memPhone, @RequestParam(name = "payTimeS", required = false) Long payTimeS, @RequestParam(name = "payTimeE", required = false) Long payTimeE, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize) { try { @@ -352,6 +353,7 @@ public class HighTyAgentOilStationController { param.put("orderNo", orderNo); param.put("goodsName", goodsName); param.put("memPhone", memPhone); + param.put("orderStatus", orderStatus); if (payTimeS != null) { param.put("payTimeS", DateUtil.format(new Date(payTimeS), "yyyy-MM-dd HH:mm:ss")); } @@ -412,6 +414,7 @@ public class HighTyAgentOilStationController { @RequestParam(name = "orgName", required = false) String orgName, @RequestParam(name = "orgId", required = false) Long orgId, @RequestParam(name = "memPhone", required = false) String memPhone, + @RequestParam(name = "orderStatus", required = false) Integer orderStatus, @RequestParam(name = "payTimeS", required = false) Long payTimeS, @RequestParam(name = "payTimeE", required = false) Long payTimeE) { try { @@ -423,6 +426,7 @@ public class HighTyAgentOilStationController { param.put("orderNo", orderNo); param.put("goodsName", goodsName); param.put("memPhone", memPhone); + param.put("orderStatus", orderStatus); if (payTimeS != null) { param.put("payTimeS", DateUtil.format(new Date(payTimeS), "yyyy-MM-dd HH:mm:ss")); } @@ -486,6 +490,8 @@ public class HighTyAgentOilStationController { headList.add("团油枪价"); headList.add("创建时间"); headList.add("支付时间"); + headList.add("订单状态"); + headList.add("退款时间"); List> dataList = new ArrayList<>(); List data; @@ -518,7 +524,19 @@ public class HighTyAgentOilStationController { data.add(orderModel.getGasPriceGun()); data.add(orderModel.getCreateTime()); data.add(orderModel.getPayTime()); + + // 订单状态：1 待支付 2 已支付 3.已完成 4. 已退款 5.已取消 6.退款中 7.拒绝退款 + if (orderModel.getOrderStatus().equals(3)) { + data.add("已完成"); + } else if (orderModel.getOrderStatus().equals(4)) { + data.add("已退款"); + } else if (orderModel.getOrderStatus().equals(6)) { + data.add("退款中"); + } else if (orderModel.getOrderStatus().equals(7)) { + data.add("退款驳回"); + } dataList.add(data); + data.add(orderModel.getRefundTime()); } String fileUrl = SysConst.getSysConfig().getFileUrl() + "/temporary/"; diff --git a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java index b69f874e..e5a6ecfd 100644 --- a/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java +++ b/hai-service/src/main/java/com/hai/dao/HighTyAgentOilStationMapperExt.java @@ -78,6 +78,8 @@ public interface HighTyAgentOilStationMapperExt { " a.gas_price_gun gasPriceGun," + " b.create_time createTime," + " b.pay_time payTime, " + + " b.order_status orderStatus, " + + " b.refund_time refundTime, " + " a.gas_org_name orgName, " + " a.gas_agent_name agentName, " + " a.gas_salesman_name salesmanName " + @@ -99,6 +101,7 @@ public interface HighTyAgentOilStationMapperExt { " AND b.mem_phone like concat('%',#{param.memPhone},'%') " + " = #{param.payTimeS} ]]> " + " " + + " AND b.order_status = #{param.orderStatus} " + " AND a.child_orde_status IN ( 2, 3 ) " + " ORDER BY" + " b.pay_time DESC" + diff --git a/hai-service/src/main/java/com/hai/model/TyOrderModel.java b/hai-service/src/main/java/com/hai/model/TyOrderModel.java index 1d40025d..ac15817f 100644 --- a/hai-service/src/main/java/com/hai/model/TyOrderModel.java +++ b/hai-service/src/main/java/com/hai/model/TyOrderModel.java @@ -20,11 +20,29 @@ public class TyOrderModel { private BigDecimal gasPriceGun; private Date createTime; private Date payTime; + private Integer orderStatus; + private Date refundTime; private String orgName; private String agentName; private String salesmanName; + public Integer getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(Integer orderStatus) { + this.orderStatus = orderStatus; + } + + public Date getRefundTime() { + return refundTime; + } + + public void setRefundTime(Date refundTime) { + this.refundTime = refundTime; + } + public BigDecimal getOilLiters() { return oilLiters; }