|
@@ -3,6 +3,7 @@ package com.dgtly.system.service.impl;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.dgtly.common.utils.ShiroSaltUtil;
|
|
import com.dgtly.common.utils.ShiroSaltUtil;
|
|
@@ -66,6 +67,9 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SysUserShopExtMapper userShopExtMapper;
|
|
private SysUserShopExtMapper userShopExtMapper;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private SysDictDataMapper sysDictDataMapper;
|
|
|
|
|
+
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private SysUserServiceImpl sysUserService;
|
|
private SysUserServiceImpl sysUserService;
|
|
|
|
|
|
|
@@ -836,12 +840,26 @@ public class SysUserServiceImpl implements ISysUserService
|
|
|
headers.put("trackId",uuidStr);
|
|
headers.put("trackId",uuidStr);
|
|
|
headers.put("sourceSystem","SSB");
|
|
headers.put("sourceSystem","SSB");
|
|
|
|
|
|
|
|
|
|
+ List<SysDictData> sysDictData = sysDictDataMapper.selectDictDataByType("sys_system_bmd_name");
|
|
|
|
|
+ log.info("获取非bmd的机构:{}", JSON.toJSON(sysDictData));
|
|
|
|
|
+ boolean isBmd = false;
|
|
|
|
|
+ for (SysDictData sysDictData1 : sysDictData) {
|
|
|
|
|
+ if(sysDictData1.getDictLabel().equals(subOfficeName)){
|
|
|
|
|
+ isBmd = true;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
try{
|
|
try{
|
|
|
if (subOfficeName != null && subOfficeName.startsWith("BMD")) {
|
|
if (subOfficeName != null && subOfficeName.startsWith("BMD")) {
|
|
|
- // subOfficeName 以 "BMD" 开头的处理逻辑
|
|
|
|
|
- //bmd
|
|
|
|
|
- headers.put("serviceName","S_XXX_BMDOMS_BMDNewStore_S");
|
|
|
|
|
- HttpUtils.sendJsonPostWithHeaders(esbShopStoneLikePaintUserUrl,headers,params);
|
|
|
|
|
|
|
+ if (isBmd){
|
|
|
|
|
+ //非bmd
|
|
|
|
|
+ headers.put("serviceName","S_XXX_BMDOMS_DORDERNewStore_S");
|
|
|
|
|
+ HttpUtils.sendJsonPostWithHeaders(esbShopStoneLikePaintUserUrl,headers,params);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ // subOfficeName 以 "BMD" 开头的处理逻辑
|
|
|
|
|
+ //bmd
|
|
|
|
|
+ headers.put("serviceName","S_XXX_BMDOMS_BMDNewStore_S");
|
|
|
|
|
+ HttpUtils.sendJsonPostWithHeaders(esbShopStoneLikePaintUserUrl,headers,params);
|
|
|
|
|
+ }
|
|
|
}else{
|
|
}else{
|
|
|
//非bmd
|
|
//非bmd
|
|
|
headers.put("serviceName","S_XXX_BMDOMS_DORDERNewStore_S");
|
|
headers.put("serviceName","S_XXX_BMDOMS_DORDERNewStore_S");
|