Merge branch 'master' into dev_yy

* master:
  修改区域公司
  修改区域公司
  1

# Conflicts:
#	hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java

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<String , Object> map = new HashMap<>();
             map.put("agentId" , agentId);
+            map.put("code" , code);
 
             PageHelper.startPage(pageNum,pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(highOrderService.orderListByAgentId(map)));

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<HighOrder> list = highOrderMapper.selectByExample(example);
 

hai-service/src/main/resources/prod-9401/commonConfig.properties

@@ -97,3 +97,4 @@ unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586
 
 #url
 fileUrl=/home/project/hsg/filesystem/
+

hai-service/src/main/resources/prod/commonConfig.properties

@@ -95,3 +95,4 @@ unionRsaKey=f2e6b6b95da445866194498c371a7c8af2e6b6b95da44586
 
 #url
 fileUrl=/home/project/hsg/filesystem/
+