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 e055656f..cb3d2e10 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 @@ -3091,6 +3091,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); diff --git a/hai-service/src/main/resources/prod-9401/commonConfig.properties b/hai-service/src/main/resources/prod-9401/commonConfig.properties index 9442bece..52af6340 100644 --- a/hai-service/src/main/resources/prod-9401/commonConfig.properties +++ b/hai-service/src/main/resources/prod-9401/commonConfig.properties @@ -97,3 +97,4 @@ unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586 #url fileUrl=/home/project/hsg/filesystem/ + diff --git a/hai-service/src/main/resources/prod/commonConfig.properties b/hai-service/src/main/resources/prod/commonConfig.properties index 3f002376..6f7009f1 100644 --- a/hai-service/src/main/resources/prod/commonConfig.properties +++ b/hai-service/src/main/resources/prod/commonConfig.properties @@ -95,3 +95,4 @@ unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586 #url fileUrl=/home/project/hsg/filesystem/ +