czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2024-11-21 16:18:13 +08:00
parent 1fc38f75ba d23cf1c320
commit 196d232e42
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
View File

@ -126,17 +126,14 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
Predicate query1 = criteriaBuilder.equal(root.get("id"), criteria.getId()); Predicate query1 = criteriaBuilder.equal(root.get("id"), criteria.getId());
Predicate query2 = criteriaBuilder.and( Predicate query2 = criteriaBuilder.and(
criteriaBuilder.equal(root.get("mainId"), criteria.getId()), criteriaBuilder.equal(root.get("mainId"), criteria.getId()),
criteriaBuilder.notEqual(root.get("type"), "only"), criteriaBuilder.notEqual(root.get("type"), "only")
criteriaBuilder.equal(root.get("tubeType"), 1)
); );
// 再将两个子条件进行或运算组合成最终条件
Predicate predicate = criteriaBuilder.or( Predicate predicate = criteriaBuilder.or(
query1, query1,
query2 query2
); );
criteriaBuilder.desc(root.get("tubeType"));
return predicate; return predicate;
}); });
return list; return list;
@ -213,6 +210,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
} }
}else { }else {
tbShopInfo.setMainId(null); tbShopInfo.setMainId(null);
tbShopInfo.setTubeType(1);
} }
//增加商户详情 //增加商户详情
@ -309,6 +307,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
} }
}else { }else {
tbShopInfo.setMainId(null); tbShopInfo.setMainId(null);
tbShopInfo.setTubeType(1);
} }
if (StringUtils.isNotBlank(resources.getShopName()) && !resources.getShopName().equals(tbShopInfo.getShopName())) { if (StringUtils.isNotBlank(resources.getShopName()) && !resources.getShopName().equals(tbShopInfo.getShopName())) {
shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString()); shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString());