修改区域公司

dev-discount
袁野 2 years ago
parent ee3170150f
commit 1c8ce7bef3
  1. 2
      hai-bweb/src/main/java/com/bweb/controller/BsDistributionUserRelController.java
  2. 3
      hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

@ -141,12 +141,14 @@ public class BsDistributionUserRelController {
@ResponseBody @ResponseBody
@ApiOperation(value = "B端查询代理商订单") @ApiOperation(value = "B端查询代理商订单")
public ResponseData orderListByAgentId(@RequestParam(name = "agentId", required = false) Long agentId, 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 = "pageNum", required = true) Integer pageNum,
@RequestParam(name = "pageSize", required = true) Integer pageSize) { @RequestParam(name = "pageSize", required = true) Integer pageSize) {
try { try {
Map<String , Object> map = new HashMap<>(); Map<String , Object> map = new HashMap<>();
map.put("agentId" , agentId); map.put("agentId" , agentId);
map.put("code" , code);
PageHelper.startPage(pageNum,pageSize); PageHelper.startPage(pageNum,pageSize);
return ResponseMsgUtil.success(new PageInfo<>(highOrderService.orderListByAgentId(map))); return ResponseMsgUtil.success(new PageInfo<>(highOrderService.orderListByAgentId(map)));

@ -3087,6 +3087,9 @@ public class HighOrderServiceImpl implements HighOrderService {
} else { } else {
criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L); criteria.andIdentificationCodeIsNotNull().andIdentificationCodeNotEqualTo(60L);
} }
if (MapUtils.getLong(map , "code") != null) {
criteria.andIdentificationCodeEqualTo(MapUtils.getLong(map , "code"));
}
List<HighOrder> list = highOrderMapper.selectByExample(example); List<HighOrder> list = highOrderMapper.selectByExample(example);

Loading…
Cancel
Save