合并0127分支

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.dgtly.system.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dgtly.common.utils.ShiroSaltUtil;
@@ -66,6 +67,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     private SysUserShopExtMapper userShopExtMapper;
 
+    @Autowired
+    private SysDictDataMapper sysDictDataMapper;
+
     @Autowired
     private SysUserServiceImpl sysUserService;
 
@@ -803,10 +807,24 @@ public class SysUserServiceImpl implements ISysUserService
             Map<String, Object> params = new HashMap<>();
             Map<String,String> urlMap = new HashMap<>();
             urlMap.put("userid","ERP");
+            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;
+                }
+            }
             if (subOfficeName != null && subOfficeName.startsWith("BMD")){
-                //bmd token死值
-                String bmdToken="575A4BE6-FCD8-485D-98E0-E51592058AB7";
-                urlMap.put("token",bmdToken);
+                if (isBmd){
+                    //非bmd token 死值
+                    String dorderToken="80027CC7791640CDBAE4D8F0E587985F";
+                    urlMap.put("token",dorderToken);
+                }else {
+                    //bmd token死值
+                    String bmdToken="575A4BE6-FCD8-485D-98E0-E51592058AB7";
+                    urlMap.put("token",bmdToken);
+                }
             }else{
                 //非bmd token 死值
                 String dorderToken="80027CC7791640CDBAE4D8F0E587985F";
@@ -838,11 +856,20 @@ public class SysUserServiceImpl implements ISysUserService
 
             try{
                 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");
+                        log.info("非bmd请求报文:{}",params);
+                        HttpUtils.sendJsonPostWithHeaders(esbShopStoneLikePaintUserUrl,headers,params);
+                    }else {
+                        // subOfficeName 以 "BMD" 开头的处理逻辑
+                        //bmd
+                        log.info("bmd请求报文:{}",params);
+                        headers.put("serviceName","S_XXX_BMDOMS_BMDNewStore_S");
+                        HttpUtils.sendJsonPostWithHeaders(esbShopStoneLikePaintUserUrl,headers,params);
+                    }
                 }else{
+                    log.info("非bmd请求报文:{}",params);
                     //非bmd
                     headers.put("serviceName","S_XXX_BMDOMS_DORDERNewStore_S");
                     HttpUtils.sendJsonPostWithHeaders(esbShopStoneLikePaintUserUrl,headers,params);