From c82c47008838bf506bec4de8abc024419feb1ff6 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 19 Jul 2024 17:08:58 +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 --- .../main/java/com/bweb/controller/BsGasOrderController.java | 6 ++++++ .../main/java/com/bweb/controller/BsMerchantController.java | 4 +++- service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java | 1 + .../com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java | 4 ++++ .../hfkj/service/merchant/impl/BsMerchantServiceImpl.java | 4 ++++ 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java b/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java index 545e1e1..09be0c7 100644 --- a/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java +++ b/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java @@ -64,6 +64,7 @@ public class BsGasOrderController { @RequestParam(name = "paySerialNo", required = false) String paySerialNo, @RequestParam(name = "channelType", required = false) Integer channelType, @RequestParam(name = "channelOrderNo", required = false) String channelOrderNo, + @RequestParam(name = "abnormal", required = false) String abnormal, @RequestParam(name = "status", required = false) Integer status, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @RequestParam(name = "createTimeE", required = false) Long createTimeE, @@ -96,6 +97,7 @@ public class BsGasOrderController { param.put("gasClassGroupTaskId", gasClassGroupTaskId); param.put("gasStaffName", gasStaffName); param.put("gasOilNo", gasOilNo); + param.put("abnormal", abnormal); if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { param.put("merId", merId); @@ -137,6 +139,7 @@ public class BsGasOrderController { @RequestParam(name = "channelType", required = false) Integer channelType, @RequestParam(name = "channelOrderNo", required = false) String channelOrderNo, @RequestParam(name = "status", required = false) Integer status, + @RequestParam(name = "abnormal", required = false) Integer abnormal, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @RequestParam(name = "createTimeE", required = false) Long createTimeE, @RequestParam(name = "payTimeS", required = false) Long payTimeS, @@ -170,6 +173,7 @@ public class BsGasOrderController { param.put("gasClassGroupTaskId", gasClassGroupTaskId); param.put("gasStaffName", gasStaffName); param.put("gasOilNo", gasOilNo); + param.put("abnormal", abnormal); if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { param.put("merId", merId); @@ -213,6 +217,7 @@ public class BsGasOrderController { @RequestParam(name = "channelType", required = false) Integer channelType, @RequestParam(name = "channelOrderNo", required = false) String channelOrderNo, @RequestParam(name = "status", required = false) Integer status, + @RequestParam(name = "abnormal", required = false) Integer abnormal, @RequestParam(name = "createTimeS", required = false) Long createTimeS, @RequestParam(name = "createTimeE", required = false) Long createTimeE, @RequestParam(name = "payTimeS", required = false) Long payTimeS, @@ -244,6 +249,7 @@ public class BsGasOrderController { param.put("gasClassGroupTaskId", gasClassGroupTaskId); param.put("gasStaffName", gasStaffName); param.put("gasOilNo", gasOilNo); + param.put("abnormal", abnormal); if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) { param.put("merId", merId); diff --git a/bweb/src/main/java/com/bweb/controller/BsMerchantController.java b/bweb/src/main/java/com/bweb/controller/BsMerchantController.java index 6e07f69..f873a58 100644 --- a/bweb/src/main/java/com/bweb/controller/BsMerchantController.java +++ b/bweb/src/main/java/com/bweb/controller/BsMerchantController.java @@ -231,12 +231,14 @@ public class BsMerchantController { @RequestMapping(value = "/queryMerList", method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "查询商户列表") - public ResponseData queryMerList(@RequestParam(value = "merNo", required = false) String merNo, + public ResponseData queryMerList(@RequestParam(value = "sourceType", required = false) Integer sourceType, + @RequestParam(value = "merNo", required = false) String merNo, @RequestParam(value = "merName", required = false) String merName, @RequestParam(value = "pageNum", required = true) Integer pageNum, @RequestParam(value = "pageSize", required = true) Integer pageSize) { try { Map map = new HashMap<>(); + map.put("sourceType", sourceType); map.put("merNo", merNo); map.put("merName", merName); diff --git a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java index c73002d..5097104 100644 --- a/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java +++ b/service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java @@ -35,6 +35,7 @@ public interface BsGasOrderMapperExt { " and agent_id = #{param.agentId} " + " and agent_staff_id = #{param.agentStaffId} " + " and status = #{param.status} " + + " and abnormal = #{param.abnormal} " + " and gas_class_group_id = #{param.gasClassGroupId} " + " and gas_class_group_task_id = #{param.gasClassGroupTaskId} " + " and gas_oil_no = #{param.gasOilNo} " + diff --git a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java index 778aff0..7d94037 100644 --- a/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java @@ -241,6 +241,10 @@ public class BsGasOrderServiceImpl implements BsGasOrderService { criteria.andRefundTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "refundTimeE"))); } + if (MapUtils.getBoolean(param, "abnormal") != null) { + criteria.andAbnormalEqualTo(MapUtils.getBoolean(param,"abnormal")); + } + example.setOrderByClause("create_time desc"); return gasOrderMapper.selectByExample(example); } diff --git a/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java b/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java index 2cac416..d415b7e 100644 --- a/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java @@ -169,6 +169,10 @@ public class BsMerchantServiceImpl implements BsMerchantService { BsMerchantExample example = new BsMerchantExample(); BsMerchantExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(MerchantStatusEnum.status0.getNumber()); + if (MapUtils.getInteger(param, "sourceType") != null) { + criteria.andSourceTypeEqualTo(MapUtils.getInteger(param, "sourceType")); + } + if (StringUtils.isNotBlank(MapUtils.getString(param, "merNo"))) { criteria.andMerNoLike("%"+MapUtils.getString(param, "merNo")+"%"); }