From 2ff2279b9a5084851631cc41f81915143ffa1c33 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Fri, 5 Nov 2021 10:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bweb/controller/OutRechargeOrderController.java | 7 ++++++- .../com/hai/service/impl/OutRechargeOrderServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) 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 62538541..932b1211 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java @@ -127,6 +127,7 @@ public class OutRechargeOrderController { @RequestParam(name = "rechargeContent", required = false) String rechargeContent, @RequestParam(name = "userPhone", required = false) String userPhone, @RequestParam(name = "payType", required = false) Integer payType, + @RequestParam(name = "code", required = false) Integer code, @RequestParam(name = "payTimeS", required = false) Long payTimeS, @RequestParam(name = "payTimeE", required = false) Long payTimeE, @RequestParam(name = "pageNum", required = true) Integer pageNum, @@ -155,7 +156,9 @@ public class OutRechargeOrderController { } if (payType != null) { map.put("payType" , payType.toString()); - + } + if (code != null) { + map.put("code" , code.toString()); } if (payTimeS != null) { map.put("payTimeS", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(payTimeS)); @@ -196,6 +199,7 @@ public class OutRechargeOrderController { @RequestParam(name = "rechargeContent", required = false) String rechargeContent, @RequestParam(name = "userPhone", required = false) String userPhone, @RequestParam(name = "payType", required = false) Integer payType, + @RequestParam(name = "code", required = false) Integer code, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @RequestParam(name = "createTimeE", required = false) Long createTimeE, @RequestParam(name = "payTimeS", required = false) Long payTimeS, @@ -209,6 +213,7 @@ public class OutRechargeOrderController { map.put("rechargeContent", rechargeContent); map.put("userPhone", userPhone); map.put("payType", payType); + map.put("code", code); map.put("createTimeS", createTimeS); map.put("createTimeE", createTimeE); map.put("payTimeS", payTimeS); 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 9f913a87..09b9dbdb 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 @@ -65,6 +65,9 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService { if (MapUtils.getInteger(map, "payType") != null) { criteria.andPayTypeEqualTo(MapUtils.getInteger(map, "payType")); } + if (MapUtils.getInteger(map, "code") != null) { + criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map, "code")); + } if (MapUtils.getString(map, "orderNo") != null) { criteria.andOrderNoLike("%" + MapUtils.getString(map, "orderNo") + "%");