angelo
/
java-zk-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## Opt - 分享商品列表 增加查询条件(商品名/商品类别)

This commit is contained in:
sangelxiu1 2025-10-15 16:56:58 +08:00
parent 429b6b5ff1
commit 662c99207e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.hzs.member.base.service.impl; package com.hzs.member.base.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.Validator;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
@ -2464,6 +2465,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
Set<Long> pkMemberList = new HashSet<>(); Set<Long> pkMemberList = new HashSet<>();
for (ShowWaresDTO showWaresDTO : showWaresDTOS) { for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
if(CollUtil.isEmpty(showWaresDTO.getWaresAuthorityList())){
continue;
}
for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) { for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) {
if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) { if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) {
// 血缘关系 // 血缘关系
@ -2501,6 +2505,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
} }
for (ShowWaresDTO showWaresDTO : showWaresDTOS) { for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
if(CollUtil.isEmpty(showWaresDTO.getWaresAuthorityList())){
continue;
}
boolean isShowWares = true; boolean isShowWares = true;
for (BdWaresAuthority bdWaresAuthority : showWaresDTO.getWaresAuthorityList()) { for (BdWaresAuthority bdWaresAuthority : showWaresDTO.getWaresAuthorityList()) {
if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue()) { if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue()) {

10
bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml
View File

@ -505,6 +505,13 @@
inner join bd_wares_extend be inner join bd_wares_extend be
on bw.pk_id = be.pk_wares on bw.pk_id = be.pk_wares
left join BD_AREA_CLASSIFY bac on bac.pk_id = bw.PK_AREA_CLASSIFY left join BD_AREA_CLASSIFY bac on bac.pk_id = bw.PK_AREA_CLASSIFY
<if test="param.pkAreaClassify != null">
right join (select pk_id
from BD_AREA_CLASSIFY cm
start with cm.pk_id = #{param.pkAreaClassify}
connect by prior cm.pk_id = cm.pk_parent
order by level) te on te.pk_id = bw.PK_AREA_CLASSIFY
</if>
where bw.del_flag = 0 where bw.del_flag = 0
and be.del_flag = 0 and be.del_flag = 0
and be.is_put_on = 0 and be.is_put_on = 0
@ -519,9 +526,6 @@
<if test="param.pkCountry != null"> <if test="param.pkCountry != null">
and bw.pk_country = #{param.pkCountry} and bw.pk_country = #{param.pkCountry}
</if> </if>
<if test="param.pkAreaClassify != null">
and bw.PK_AREA_CLASSIFY = #{param.pkAreaClassify} or bac.pk_parent = #{param.pkAreaClassify}
</if>
<if test="param.waresName != null and param.waresName != ''"> <if test="param.waresName != null and param.waresName != ''">
and bw.WARES_NAME = '%' || #{param.waresName} || '%' and bw.WARES_NAME = '%' || #{param.waresName} || '%'
</if> </if>