From 1c8ce7bef353eee21215f8a5189a57e9484d10be Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 23 Aug 2022 17:29:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BA=E5=9F=9F=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bweb/controller/BsDistributionUserRelController.java | 2 ++ .../main/java/com/hai/service/impl/HighOrderServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/hai-bweb/src/main/java/com/bweb/controller/BsDistributionUserRelController.java b/hai-bweb/src/main/java/com/bweb/controller/BsDistributionUserRelController.java index 1afd1921..cd59ca2f 100644 --- a/hai-bweb/src/main/java/com/bweb/controller/BsDistributionUserRelController.java +++ b/hai-bweb/src/main/java/com/bweb/controller/BsDistributionUserRelController.java @@ -141,12 +141,14 @@ public class BsDistributionUserRelController { @ResponseBody @ApiOperation(value = "B端查询代理商订单") public ResponseData orderListByAgentId(@RequestParam(name = "agentId", required = false) Long agentId, + @RequestParam(name = "code", required = false) Long code, @RequestParam(name = "pageNum", required = true) Integer pageNum, @RequestParam(name = "pageSize", required = true) Integer pageSize) { try { Map map = new HashMap<>(); map.put("agentId" , agentId); + map.put("code" , code); PageHelper.startPage(pageNum,pageSize); return ResponseMsgUtil.success(new PageInfo<>(highOrderService.orderListByAgentId(map))); 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 da6b0167..14fefc3e 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 @@ -3087,6 +3087,9 @@ public class HighOrderServiceImpl implements HighOrderService { } else { criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L); } + if (MapUtils.getLong(map , "code") != null) { + criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "code")); + } List list = highOrderMapper.selectByExample(example);