zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/mall_product' of http://117.33.142.185:3000/zenghuapei/cyywl_server into feature/mall_product

pull/8/head
TianYu 2023-05-31 18:15:31 +08:00
parent d904d0b6de d7787d3193
commit 46686e4467
2 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -100,6 +100,7 @@
<select id="findListPage"
resultType="cn.iocoder.yudao.module.shop.controller.admin.recharge.vo.RechargeOrderRespVO">
select
a.id,
a.order_id,
a.pay_serial_number,
e.name as tenantName,

48
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -132,21 +132,37 @@ public class DeptServiceImpl implements DeptService {
reqVO.setParentId(DeptIdEnum.ROOT.getId());
}
validateForCreateOrUpdate(reqVO.getId(), reqVO.getParentId(), reqVO.getName());
// 更新部门
DeptDO updateObj = DeptConvert.INSTANCE.convert(reqVO);
if (DeptIdEnum.ROOT.getId().equals(updateObj.getParentId())) {
updateObj.setParentOrganizationIds(updateObj.getId() + "");
updateObj.setParentOrganizationName(updateObj.getName());
} else {
DeptDO parent = deptMapper.selectById(reqVO.getParentId());
updateObj.setParentOrganizationIds(parent.getParentOrganizationIds() + "," + updateObj.getId());
updateObj.setParentOrganizationName(parent.getParentOrganizationName() + ">" + updateObj.getName());
}
deptMapper.updateById(updateObj);
// // 更新部门
// DeptDO updateObj = DeptConvert.INSTANCE.convert(reqVO);
// if (DeptIdEnum.ROOT.getId().equals(updateObj.getParentId())) {
// updateObj.setParentOrganizationIds(updateObj.getId() + "");
// updateObj.setParentOrganizationName(updateObj.getName());
// } else {
// DeptDO parent = deptMapper.selectById(reqVO.getParentId());
// updateObj.setParentOrganizationIds(parent.getParentOrganizationIds() + "," + updateObj.getId());
// updateObj.setParentOrganizationName(parent.getParentOrganizationName() + ">" + updateObj.getName());
// }
DeptDO deptDO = deptMapper.selectById(reqVO.getId());
List<DeptDO> deptDOS = deptMapper.selectListDeep(Wrappers.<DeptDO>lambdaQuery().like(DeptDO::getParentOrganizationIds, reqVO.getId()));
deptDOS.forEach(x -> {
x.setParentOrganizationName(x.getParentOrganizationName().replace(deptDO.getName(), reqVO.getName()));
});
deptMapper.updateBatch(deptDOS,deptDOS.size());
deptDO.setName(reqVO.getName());
deptMapper.updateById(deptDO);
// 发送刷新消息
deptProducer.sendDeptRefreshMessage();
}
public static void main(String[] args) {
String words = "创盈云>测试删除1";
System.out.println("原始字符串是'" + words + "'");
System.out.println("replace(\"r's\",\"is\")结果：" + words.replace("测试删除1", "测试删除"));
}
@Override
public void deleteDept(Long id) {
// 校验是否存在
@ -322,7 +338,7 @@ public class DeptServiceImpl implements DeptService {
private static List<DeptDO> deptDOS4 = new ArrayList<>();
@Override
public void batchImport(MultipartFile file){
public void batchImport(MultipartFile file) {
try {
List<BatchImportVO> deptList = ExcelUtils.read(file, BatchImportVO.class);
@ -341,7 +357,7 @@ public class DeptServiceImpl implements DeptService {
deptDO1.setCharacteristic(batchImportVO1.getCharacteristic());
deptMapper.insert(deptDO1);
deptDO1.setParentOrganizationIds(deptDO1.getId().toString());
deptMapper.update(deptDO1,Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId,deptDO1.getId()));
deptMapper.update(deptDO1, Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId, deptDO1.getId()));
// 装入层级2
for (BatchImportVO batchImportVO : batchImportVOS2) {
DeptDO deptDO2 = new DeptDO();
@ -351,7 +367,7 @@ public class DeptServiceImpl implements DeptService {
deptDO2.setCharacteristic(batchImportVO.getCharacteristic());
deptMapper.insert(deptDO2);
deptDO2.setParentOrganizationIds(deptDO1.getParentOrganizationIds() + ">" + deptDO2.getId());
deptMapper.update(deptDO2,Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId,deptDO2.getId()));
deptMapper.update(deptDO2, Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId, deptDO2.getId()));
deptDOS2.add(deptDO2);
}
// 装入层级3
@ -365,7 +381,7 @@ public class DeptServiceImpl implements DeptService {
deptDO3.setCharacteristic(batchImportVO.getCharacteristic());
deptMapper.insert(deptDO3);
deptDO3.setParentOrganizationIds(deptDO.getParentOrganizationIds() + ">" + deptDO3.getId());
deptMapper.update(deptDO3,Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId,deptDO3.getId()));
deptMapper.update(deptDO3, Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId, deptDO3.getId()));
deptDOS3.add(deptDO3);
}
// 装入层级4
@ -378,7 +394,7 @@ public class DeptServiceImpl implements DeptService {
deptDO4.setParentOrganizationName(deptDO.getParentOrganizationName() + ">" + batchImportVO.getDepName());
deptMapper.insert(deptDO4);
deptDO4.setParentOrganizationIds(deptDO.getParentOrganizationIds() + ">" + deptDO4.getId());
deptMapper.update(deptDO4,Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId,deptDO4.getId()));
deptMapper.update(deptDO4, Wrappers.<DeptDO>lambdaUpdate().eq(DeptDO::getId, deptDO4.getId()));
deptDOS4.add(deptDO4);
}
} catch (IOException e) {