|
@@ -152,10 +152,12 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|
|
request.setAttribute("svcCode", company.getSvcCode().replace("_", "-"));
|
|
request.setAttribute("svcCode", company.getSvcCode().replace("_", "-"));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // 组织机构 -顶级
|
|
|
|
|
|
|
+ // 组织机构 -顶级 和公司的名称一样
|
|
|
|
|
+ // 二级 名称叫做 运营中心 返回的业务部门的id是运营中新的id
|
|
|
OrgVO orgVO = new OrgVO();
|
|
OrgVO orgVO = new OrgVO();
|
|
|
orgVO.setCpId(company.getCpId());
|
|
orgVO.setCpId(company.getCpId());
|
|
|
orgVO.setOrgName(company.getCpName());
|
|
orgVO.setOrgName(company.getCpName());
|
|
|
|
|
+// 二级 名称叫做 运营中心 返回的业务部门的id是运营中新的id
|
|
|
ResponseResultVO<OrgResponse> orgResponseResponseResultVO = orgFeign.insertFeignOrg(orgVO);
|
|
ResponseResultVO<OrgResponse> orgResponseResponseResultVO = orgFeign.insertFeignOrg(orgVO);
|
|
|
OrgResponse orgResponse = new OrgResponse();
|
|
OrgResponse orgResponse = new OrgResponse();
|
|
|
// 如果没有成功返回,状态设置为待审
|
|
// 如果没有成功返回,状态设置为待审
|
|
@@ -201,26 +203,115 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
|
|
|
// 生成员工 角色 基础资料(仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因) 计量单位 种类 打印票据 等等。
|
|
// 生成员工 角色 基础资料(仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因) 计量单位 种类 打印票据 等等。
|
|
|
String staffId = staffResponse.getStaffId();
|
|
String staffId = staffResponse.getStaffId();
|
|
|
Map<String, List<Map<String, Object>>> map = new HashMap<>();
|
|
Map<String, List<Map<String, Object>>> map = new HashMap<>();
|
|
|
- // 角色
|
|
|
|
|
|
|
+ List<Map<String, Object>> listCom = new ArrayList<>();
|
|
|
|
|
+ Map<String, Object> m = new HashMap<>();
|
|
|
|
|
+ m.put("gradeCode",company.getGradeCode());
|
|
|
|
|
+ listCom.add(m);
|
|
|
|
|
+ map.put("company",listCom);
|
|
|
|
|
+ // 角色及权限
|
|
|
List<RoleResponse> roleResponses = roleMapper.selectByCond(new RoleQuery());
|
|
List<RoleResponse> roleResponses = roleMapper.selectByCond(new RoleQuery());
|
|
|
|
|
+ List<Map<String, Object>> listRoles = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < roleResponses.size(); i++) {
|
|
|
|
|
+ m = new HashMap<>();
|
|
|
|
|
+ m.put("roleCode",roleResponses.get(i).getRoleCode());
|
|
|
|
|
+ m.put("roleName",roleResponses.get(i).getRoleName());
|
|
|
|
|
+ m.put("displayNo",roleResponses.get(i).getDisplayNo());
|
|
|
|
|
+ m.put("cpId",cpId);
|
|
|
|
|
+ m.put("opCreateUserId",staffId);
|
|
|
|
|
+ listRoles.add(m);
|
|
|
|
|
+ }
|
|
|
|
|
+ map.put("roles",listRoles);
|
|
|
// 基础资料(仓库 渠道 )
|
|
// 基础资料(仓库 渠道 )
|
|
|
List<WarehouseResponse> warehouseResponses = warehouseMapper.selectByCond(new WarehouseQuery());
|
|
List<WarehouseResponse> warehouseResponses = warehouseMapper.selectByCond(new WarehouseQuery());
|
|
|
|
|
+ List<Map<String, Object>> listWarehouses = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < warehouseResponses.size(); i++) {
|
|
|
|
|
+ m = new HashMap<>();
|
|
|
|
|
+ m.put("whCode",warehouseResponses.get(i).getWhCode());
|
|
|
|
|
+ m.put("whName",warehouseResponses.get(i).getWhName());
|
|
|
|
|
+ m.put("displayNo",warehouseResponses.get(i).getDisplayNo());
|
|
|
|
|
+ m.put("flgDefault",warehouseResponses.get(i).getFlgDefault());
|
|
|
|
|
+ m.put("cpId",cpId);
|
|
|
|
|
+ m.put("opCreateUserId",staffId);
|
|
|
|
|
+ listWarehouses.add(m);
|
|
|
|
|
+ }
|
|
|
|
|
+ map.put("warehouses",listWarehouses);
|
|
|
// 基础资料(仓库 渠道 )
|
|
// 基础资料(仓库 渠道 )
|
|
|
List<SaleChannelResponse> saleChannelResponses = saleChannelMapper.selectByCond(new SaleChannelQuery());
|
|
List<SaleChannelResponse> saleChannelResponses = saleChannelMapper.selectByCond(new SaleChannelQuery());
|
|
|
|
|
+ List<Map<String, Object>> listSaleChannels = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < saleChannelResponses.size(); i++) {
|
|
|
|
|
+ m = new HashMap<>();
|
|
|
|
|
+ m.put("channelCode",saleChannelResponses.get(i).getChannelCode());
|
|
|
|
|
+ m.put("channelName",saleChannelResponses.get(i).getChannelName());
|
|
|
|
|
+ m.put("displayNo",saleChannelResponses.get(i).getDisplayNo());
|
|
|
|
|
+ m.put("flgDefault",saleChannelResponses.get(i).getFlgDefault());
|
|
|
|
|
+ m.put("cpId",cpId);
|
|
|
|
|
+ m.put("opCreateUserId",staffId);
|
|
|
|
|
+ listSaleChannels.add(m);
|
|
|
|
|
+ }
|
|
|
|
|
+ map.put("saleChannels",listSaleChannels);
|
|
|
// 基础资料(仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因)
|
|
// 基础资料(仓库 渠道 收入 支出 入库 出库 账户 来源 盈亏原因)
|
|
|
List<DictionaryDataResponse> dictionaryDataResponses = dictionaryDataMapper.selectByCond(new DictionaryDataQuery());
|
|
List<DictionaryDataResponse> dictionaryDataResponses = dictionaryDataMapper.selectByCond(new DictionaryDataQuery());
|
|
|
|
|
+ List<Map<String, Object>> listDictionaryDatas = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < dictionaryDataResponses.size(); i++) {
|
|
|
|
|
+ m = new HashMap<>();
|
|
|
|
|
+ m.put("dictCode",dictionaryDataResponses.get(i).getDictCode());
|
|
|
|
|
+ m.put("dataCode",dictionaryDataResponses.get(i).getDataCode());
|
|
|
|
|
+ m.put("dataValue",dictionaryDataResponses.get(i).getDataValue());
|
|
|
|
|
+ m.put("displayNo",dictionaryDataResponses.get(i).getDisplayNo());
|
|
|
|
|
+ m.put("flgDefault",dictionaryDataResponses.get(i).getFlgDefault());
|
|
|
|
|
+ m.put("cpId",cpId);
|
|
|
|
|
+ m.put("opCreateUserId",staffId);
|
|
|
|
|
+ listDictionaryDatas.add(m);
|
|
|
|
|
+ }
|
|
|
|
|
+ map.put("dictionaryDatas",listDictionaryDatas);
|
|
|
// 计量单位
|
|
// 计量单位
|
|
|
List<UnitResponse> unitResponses = unitMapper.selectByCond(new UnitQuery());
|
|
List<UnitResponse> unitResponses = unitMapper.selectByCond(new UnitQuery());
|
|
|
|
|
+ List<Map<String, Object>> listUnits = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < unitResponses.size(); i++) {
|
|
|
|
|
+ m = new HashMap<>();
|
|
|
|
|
+ m.put("unitCode",unitResponses.get(i).getUnitCode());
|
|
|
|
|
+ m.put("unitName",unitResponses.get(i).getUnitName());
|
|
|
|
|
+ m.put("decimalPlaces",unitResponses.get(i).getDecimalPlaces());
|
|
|
|
|
+ m.put("displayNo",unitResponses.get(i).getDisplayNo());
|
|
|
|
|
+ m.put("cpId",cpId);
|
|
|
|
|
+ m.put("opCreateUserId",staffId);
|
|
|
|
|
+ listUnits.add(m);
|
|
|
|
|
+ }
|
|
|
|
|
+ map.put("units",listUnits);
|
|
|
// 种类
|
|
// 种类
|
|
|
List<GoodsCategoryResponse> goodsCategoryResponses = goodsCategoryMapper.selectByCond(new GoodsCategoryQuery());
|
|
List<GoodsCategoryResponse> goodsCategoryResponses = goodsCategoryMapper.selectByCond(new GoodsCategoryQuery());
|
|
|
-// ResponseResultVO<List<Map<String, Object>>> 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();
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ List<Map<String, Object>> listGoodsCategorys = new ArrayList<>();
|
|
|
|
|
+ for (int i = 0; i < goodsCategoryResponses.size(); i++) {
|
|
|
|
|
+ m = new HashMap<>();
|
|
|
|
|
+ m.put("catCode",goodsCategoryResponses.get(i).getCatCode());
|
|
|
|
|
+ m.put("catName",goodsCategoryResponses.get(i).getCatName());
|
|
|
|
|
+ m.put("parentId",goodsCategoryResponses.get(i).getParentId());
|
|
|
|
|
+ m.put("topId",goodsCategoryResponses.get(i).getTopId());
|
|
|
|
|
+ m.put("levelUpper",goodsCategoryResponses.get(i).getLevelUpper());
|
|
|
|
|
+ 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("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);
|
|
|
|
|
+ // 如果没有成功返回
|
|
|
|
|
+ if (listResponseResultVO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
|
|
|
|
|
+ // 无用户
|
|
|
|
|
+ throw new BaseBusinessException(listResponseResultVO.getCode(), listResponseResultVO.getMessage());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ List<Map<String, Object>> data = listResponseResultVO.getData();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 更新用户的角色ids
|
|
|
|
|
+ // staffVO.setRoleIds();
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
return ResponseResultUtil.success(company);
|
|
return ResponseResultUtil.success(company);
|
|
|
}
|
|
}
|
|
|
|
|
|