修改

src/main/java/com/steerinfo/dil/controller/RmsConsigneeController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -50,6 +51,19 @@ public class RmsConsigneeController extends BaseRESTfulController {
         return success(result);
     }
 
-
-
+    /**
+     * 新增并注册收货客户
+     * @param mapVal
+     * @return
+     */
+    @PostMapping("/registerConsignee")
+    public RESTfulResult registerConsignee(@RequestBody Map<String, Object> mapVal) {
+        try{
+            BigDecimal consigneeId = rmsConsigneeService.registerConsignee(mapVal);
+            return success(consigneeId);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage());
+        }
+    }
 }

src/main/java/com/steerinfo/dil/mapper/RmsConsigneeMapper.java

@@ -11,4 +11,6 @@ public interface RmsConsigneeMapper extends IBaseMapper<RmsConsignee, Long> {
 
     @Select("select seq__RMS_CONSIGNEE.nextval from dual")
     BigDecimal getConsigneeId();
+
+    BigDecimal findReceiveId(String consigneeName);
 }

src/main/java/com/steerinfo/dil/service/IRmsConsigneeService.java

@@ -34,4 +34,7 @@ public interface IRmsConsigneeService {
      * @return
      */
     List<Map<String, Object>> getConsigneeList(Map<String, Object> mapVal);
+
+
+    BigDecimal registerConsignee(Map<String, Object> mapVal) throws Exception;
 }

src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -105,7 +105,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
 //        String s = HttpUtil.doJsonPost("https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysusers/", json, token);
         Map<String, Object> resultMap;
         // 传formData格式--URL?参数&参数
-        resultMap = ssoFeign.addUser("Bearer " + token, consigneeCode, consigneeCompanyName, "shouhuokehu", "收货客户", "506514577756917769", "713710108567277568", "958023746726268928");
+        resultMap = ssoFeign.addUser("Bearer " + token, consigneeCompanyName, consigneeCompanyName, "shouhuokehu", "收货客户", "506514577756917769", "713710108567277568", "958023746726268928");
         // 赋权
         String code = (String) resultMap.get("code");
         String userId = null;
@@ -114,9 +114,10 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
             userId = (String) userData.get("userId");
         }
         if (userId != null) {
-            ssoFeign.addUserroles("Bearer " + token,userId, consigneeCompanyName, "958038344527384576");
+            ssoFeign.addUserroles("Bearer " + token,userId, consigneeCompanyName, "1042116550569627648");
             rmsConsignee.setConsigneeSsoId(userId);
             rmsConsignee.setConsigneeSsoCode(consigneeCode);
+            rmsConsignee.setConsigneeCompanyName(consigneeCompanyName);
         }
         int result = 0;
         // 新增
@@ -151,4 +152,47 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
     public List<Map<String, Object>> getConsigneeList(Map<String, Object> mapVal) {
         return null;
     }
+
+    @Override
+    public BigDecimal registerConsignee(Map<String, Object> mapVal) throws Exception {
+        String consigneeCompanyName=""+mapVal.get("receiveName");
+        if("null".equals(consigneeCompanyName)){
+            throw new Exception("请传入收货客户名！");
+        }
+        BigDecimal consigneeId = rmsConsigneeMapper.findReceiveId(consigneeCompanyName);
+        if(consigneeId!=null){
+            return consigneeId;
+        }
+        RmsConsignee rmsConsignee=new RmsConsignee();
+        // 调用sso接口
+        Map<String, Object> tokenMap = tokenFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+        String token = (String) data.get("accessToken");
+        Map<String,Object> headerMap = new HashMap<>();
+        // 设置token
+        headerMap.put("Content-type", "application/x-www-form-urlencoded");
+        headerMap.put("Authorization","Bearer " + token);
+        // 新增用户 传formData格式--URL?参数&参数
+        Map<String, Object> resultMap;
+        resultMap = ssoFeign.addUser("Bearer " + token, consigneeCompanyName, consigneeCompanyName, "shouhuokehu", "收货客户", "506514577756917769", "713710108567277568", "958023746726268928");
+        // 赋权
+        String code = (String) resultMap.get("code");
+        String userId = null;
+        if (("0").equals(code)) {
+            Map<String,Object> userData = (Map<String, Object>) resultMap.get("data");
+            userId = (String) userData.get("userId");
+        }
+        if (userId != null) {
+            //赋权
+            ssoFeign.addUserroles("Bearer " + token,userId, consigneeCompanyName, "1042116550569627648");
+        }
+        // 新增收货客户表
+        rmsConsignee.setConsigneeSsoId(userId);
+        rmsConsignee.setConsigneeSsoCode(consigneeCompanyName);
+        rmsConsignee.setConsigneeCompanyName(consigneeCompanyName);
+        rmsConsignee.setConsigneeId(rmsConsigneeMapper.getConsigneeId());
+        rmsConsignee.setDeleted(new BigDecimal(0));
+        rmsConsigneeMapper.insertSelective(rmsConsignee);
+        return rmsConsignee.getConsigneeId();
+    }
 }

src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -683,4 +683,10 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="findReceiveId" resultType="java.math.BigDecimal">
+    SELECT RC.CONSIGNEE_ID AS "receiveId"
+    FROM RMS_CONSIGNEE RC
+    WHERE RC.CONSIGNEE_COMPANY_NAME = #{consigneeName}
+    FETCH NEXT 1 ROWS ONLY
+  </select>
 </mapper>