插入公司的基础数据

src/main/java/com/dk/oauth/feign/service/StaffFeign.java

@@ -3,7 +3,7 @@ package com.dk.oauth.feign.service;
 import com.dk.common.infrastructure.constant.Constant;
 import com.dk.common.model.response.mst.StaffResponse;
 import com.dk.common.model.vo.mst.StaffVO;
-import com.dk.common.response.ResponseResultVO; 
+import com.dk.common.response.ResponseResultVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,8 +32,8 @@ public interface StaffFeign {
      * @author : 姜永辉
      * @date : 2023-11-02 16:27
      */
-    @PostMapping({"//" + Constant.MDM_PREFIX + Constant.SERVER + "-$CLUSTER_ID"   + Constant.MST_ROLE + "/insert_feign_company_data"})
-    ResponseResultVO<List<Map<String, Object>>> insertFeignCompanyData(@RequestBody Map<String, List<Map<String, Object>>> map);
+    @PostMapping({"//" + Constant.MDM_PREFIX + Constant.SERVER + "-$CLUSTER_ID"   + Constant.MST_STAFF + "/insert_feign_company_data"})
+    ResponseResultVO  insertFeignCompanyData(@RequestBody Map<String, List<Map<String, Object>>> map);
 
     /**
      * @desc : 注册商户时候插入员工

src/main/java/com/dk/oauth/response/UnitResponse.java

@@ -103,14 +103,14 @@ public class UnitResponse extends PageInfo<UnitResponse> implements Serializable
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
+//    /**
+//     * 创建时间 (触发器自动处理)
+//     */
+//    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+//    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @TableField(typeHandler = TimestampTypeHandler.class)
+//    private LocalDateTime opCreateTime;
 
 
     /**
@@ -122,14 +122,14 @@ public class UnitResponse extends PageInfo<UnitResponse> implements Serializable
     private String opCreateUserId;
 
 
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
+//    /**
+//     * 修改时间 (触发器自动处理)
+//     */
+//    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
+//    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @TableField(typeHandler = TimestampTypeHandler.class)
+//    private LocalDateTime opUpdateTime;
 
 
     /**
@@ -149,14 +149,14 @@ public class UnitResponse extends PageInfo<UnitResponse> implements Serializable
     private String opAppCode;
 
 
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
+//    /**
+//     * 数据时间戳 (触发器自动处理)
+//     */
+//    @Excel(name = "数据时间戳 (触发器自动处理)")
+//    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @TableField(typeHandler = TimestampTypeHandler.class)
+//    private LocalDateTime opTimestamp;
 
 
     /**

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -177,7 +177,7 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         staffVO.setStaffName(userLogin.getUserPhone());
         staffVO.setStaffPhone(userLogin.getUserPhone());
         staffVO.setOrgId(orgResponse.getOrgId());
-        // 生成默认的角色数组
+        // 生成默认的角色数组--// 更新用户的角色ids--在插入基础数据的时候更新了。
 //        staffVO.setRoleIds();
         // 注册商户时候插入员工
         ResponseResultVO<StaffResponse> staffResponseResponseResultVO = staffFeign.insertFeignStaff(staffVO);
@@ -291,27 +291,26 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
             m.put("levelLower",goodsCategoryResponses.get(i).getLevelLower());
             m.put("levelLeaf",goodsCategoryResponses.get(i).getLevelLeaf());
             m.put("levelNo",goodsCategoryResponses.get(i).getLevelNo());
-            m.put("parentId",goodsCategoryResponses.get(i).getLevelCode());
-            m.put("parentId",goodsCategoryResponses.get(i).getLevelName());
+            m.put("levelCode",goodsCategoryResponses.get(i).getLevelCode());
+            m.put("levelName",goodsCategoryResponses.get(i).getLevelName());
             m.put("displayNo",goodsCategoryResponses.get(i).getDisplayNo());
             m.put("cpId",cpId);
             m.put("opCreateUserId",staffId);
             listGoodsCategorys.add(m);
         }
         map.put("goodsCategorys",listGoodsCategorys);
-        ResponseResultVO<List<Map<String, Object>>> listResponseResultVO = staffFeign.insertFeignCompanyData(map);
+        ResponseResultVO  listResponseResultVO = staffFeign.insertFeignCompanyData(map);
+
         // 如果没有成功返回
         if (listResponseResultVO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
             // 无用户
             throw new BaseBusinessException(listResponseResultVO.getCode(), listResponseResultVO.getMessage());
         } else {
-            List<Map<String, Object>> data = listResponseResultVO.getData();
+            // 更新用户的角色ids--在插入基础数据的时候更新了。
+//            String rid = listResponseResultVO.getData();
+//            roleids.add(rid);
         }
 
-        // 更新用户的角色ids
-        //  staffVO.setRoleIds();
-
-
         return ResponseResultUtil.success(company);
     }