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

## 调整专区商品列表显示；

This commit is contained in:
cabbage 2025-05-30 17:27:07 +08:00
parent d399b32688
commit 159ffbdd34
3 changed files with 45 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2935,20 +2935,22 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
Set<WaresAuthorityParentParam> waresAuthorityPlaceParamList = new HashSet<>(); Set<WaresAuthorityParentParam> waresAuthorityPlaceParamList = new HashSet<>();
for (ShowWaresDTO showWaresDTO : showWaresDTOS) { for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) { if (CollectionUtil.isNotEmpty(showWaresDTO.getWaresAuthorityList())) {
if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) { for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) {
WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder() if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) {
.pkMember(bw.getPkMember()) WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder()
.loginMember(showWaresDTO.getLoginMember()) .pkMember(bw.getPkMember())
.build(); .loginMember(showWaresDTO.getLoginMember())
waresAuthorityParentParamList.add(waresAuthorityParentParam); .build();
} waresAuthorityParentParamList.add(waresAuthorityParentParam);
if (bw.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue() || bw.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) { }
WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder() if (bw.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue() || bw.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) {
.pkMember(bw.getPkMember()) WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder()
.loginMember(showWaresDTO.getLoginMember()) .pkMember(bw.getPkMember())
.build(); .loginMember(showWaresDTO.getLoginMember())
waresAuthorityPlaceParamList.add(waresAuthorityParentParam); .build();
waresAuthorityPlaceParamList.add(waresAuthorityParentParam);
}
} }
} }
} }
@ -2967,19 +2969,21 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
for (ShowWaresDTO showWaresDTO : showWaresDTOS) { for (ShowWaresDTO showWaresDTO : showWaresDTOS) {
boolean isShowWares = true; boolean isShowWares = true;
for (BdWaresAuthority bdWaresAuthority : showWaresDTO.getWaresAuthorityList()) { if (CollectionUtil.isNotEmpty(showWaresDTO.getWaresAuthorityList())) {
if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue()) { for (BdWaresAuthority bdWaresAuthority : showWaresDTO.getWaresAuthorityList()) {
// 血缘可见 if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue()) {
isShowWares = waresAuthorityParentList.contains(bdWaresAuthority.getPkMember()); // 血缘可见
} else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) { isShowWares = waresAuthorityParentList.contains(bdWaresAuthority.getPkMember());
// 血缘禁止 } else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) {
isShowWares = !waresAuthorityParentList.contains(bdWaresAuthority.getPkMember()); // 血缘禁止
} else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue()) { isShowWares = !waresAuthorityParentList.contains(bdWaresAuthority.getPkMember());
// 安置可见 } else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue()) {
isShowWares = waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); // 安置可见
} else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) { isShowWares = waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember());
// 安置禁止 } else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) {
isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); // 安置禁止
isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember());
}
} }
} }
resultMap.put(showWaresDTO.getPkWares(), isShowWares); resultMap.put(showWaresDTO.getPkWares(), isShowWares);

9
bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java
View File

@ -93,11 +93,13 @@ public class ApiBdWaresController extends BaseController {
/** /**
* 专区商品列表
*
* @param cuWaresParams 专区、分类 * @param cuWaresParams 专区、分类
*/ */
@RequestMapping("/query-spe-wares") @RequestMapping("/query-spe-wares")
public AjaxResult queryWaresBySpecial(@RequestBody CuWaresParams cuWaresParams) { public AjaxResult queryWaresBySpecial(@RequestBody CuWaresParams cuWaresParams) {
if (cuWaresParams.getSpecialArea() == null) { if (null == cuWaresParams.getSpecialArea()) {
return AjaxResult.error(SaOrderMsgConstants.SPECIAL_AREA_NOT_EMPTY); return AjaxResult.error(SaOrderMsgConstants.SPECIAL_AREA_NOT_EMPTY);
} }
@ -213,7 +215,7 @@ public class ApiBdWaresController extends BaseController {
continue; continue;
} }
CuWaresParams waresParams = BeanUtil.copyProperties(waresExt, CuWaresParams.class); CuWaresParams waresParams = BeanUtil.copyProperties(waresExt, CuWaresParams.class, "videoUrl", "details", "cover4", "cover5", "cover6");
if (waresIdSet.contains(waresExt.getPkId())) { if (waresIdSet.contains(waresExt.getPkId())) {
String gradeKey = waresExt.getPkId() + "_" + ERangeType.GRADE.getValue() + "_" + cuMember.getPkSettleGrade(); String gradeKey = waresExt.getPkId() + "_" + ERangeType.GRADE.getValue() + "_" + cuMember.getPkSettleGrade();
String awardsKey = waresExt.getPkId() + "_" + ERangeType.AWARDS.getValue() + "_" + cuMember.getPkAwards(); String awardsKey = waresExt.getPkId() + "_" + ERangeType.AWARDS.getValue() + "_" + cuMember.getPkAwards();
@ -235,7 +237,8 @@ public class ApiBdWaresController extends BaseController {
// 零售价 // 零售价
BigDecimal retailPrice = BigDecimal.ZERO; BigDecimal retailPrice = BigDecimal.ZERO;
if (EOrderType.REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea() || EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea()) { if (EOrderType.REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea()
|| EOrderType.SPECIAL_REPURCHASE_ORDER.getValue() == cuWaresParams.getSpecialArea()) {
for (BdWaresRange bdWaresRange : bdWaresRangeList) { for (BdWaresRange bdWaresRange : bdWaresRangeList) {
if (waresExt.getPkId().intValue() == bdWaresRange.getPkWares().intValue()) { if (waresExt.getPkId().intValue() == bdWaresRange.getPkWares().intValue()) {
waresPrice = waresPrice.add(bdWaresRange.getPrice()); waresPrice = waresPrice.add(bdWaresRange.getPrice());

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

@ -87,13 +87,17 @@
<!-- 根据条件查询商品信息 --> <!-- 根据条件查询商品信息 -->
<select id="queryWaresByCondition" resultMap="BaseResultMap"> <select id="queryWaresByCondition" resultMap="BaseResultMap">
select bw.PK_COUNTRY,bw.PK_ID,be.pk_id PK_WARES_EXTEND,be.IS_MAKER_GIFT, bw.WARES_CODE, bw.WARES_NAME, PK_TRANSACTION, select bw.PK_COUNTRY, bw.PK_ID, be.pk_id PK_WARES_EXTEND,
PK_AREA_CLASSIFY, COVER1, COVER2, COVER3, COVER4, COVER5, COVER6,DETAILS_TYPE, be.IS_MAKER_GIFT, bw.WARES_CODE, bw.WARES_NAME, PK_TRANSACTION,
PK_AREA_CLASSIFY, COVER1, COVER2, COVER3, COVER4, COVER5, COVER6,
DETAILS_TYPE,
bw.WARES_PRICE, bw.WARES_ACHIEVE, bw.WARES_PRICE, bw.WARES_ACHIEVE,
DETAILS, SORT, SPECIAL_AREA, IS_SINGLE, DETAILS, SORT, SPECIAL_AREA, IS_SINGLE,
IS_PUT_ON, PRE_SALE_STATUS, PUT_ON_TIME, PUT_OFF_TIME, OPERATE_SCOPE, PREFIX_LABEL, COOL_LABEL, IS_PUT_ON, PRE_SALE_STATUS, PUT_ON_TIME, PUT_OFF_TIME,
OPERATE_SCOPE, PREFIX_LABEL, COOL_LABEL,
S_LABEL, SALES, IS_SALE, ARRIVAL_TIME, WARN_MESSAGE, S_LABEL, SALES, IS_SALE, ARRIVAL_TIME, WARN_MESSAGE,
IS_LAND_TRANS,IS_AIR_TRANS,IS_OCEAN_TRANS,VIDEO_URL, be.maker_income,be.PK_SPECIAL_CURRENCY IS_LAND_TRANS, IS_AIR_TRANS, IS_OCEAN_TRANS,
VIDEO_URL, COVER, be.maker_income, be.PK_SPECIAL_CURRENCY
from bd_wares bw from bd_wares bw
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