diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java index 2bff3bd9..02b96f00 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java @@ -2935,20 +2935,22 @@ public class CuMemberServiceImpl extends ServiceImpl i Set waresAuthorityPlaceParamList = new HashSet<>(); for (ShowWaresDTO showWaresDTO : showWaresDTOS) { - for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) { - if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) { - WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder() - .pkMember(bw.getPkMember()) - .loginMember(showWaresDTO.getLoginMember()) - .build(); - waresAuthorityParentParamList.add(waresAuthorityParentParam); - } - if (bw.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue() || bw.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) { - WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder() - .pkMember(bw.getPkMember()) - .loginMember(showWaresDTO.getLoginMember()) - .build(); - waresAuthorityPlaceParamList.add(waresAuthorityParentParam); + if (CollectionUtil.isNotEmpty(showWaresDTO.getWaresAuthorityList())) { + for (BdWaresAuthority bw : showWaresDTO.getWaresAuthorityList()) { + if (bw.getAuthorityType() == EWaresPermissionType.BLOOD_ALLOW.getValue() || bw.getAuthorityType() == EWaresPermissionType.BLOOD_STOP.getValue()) { + WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder() + .pkMember(bw.getPkMember()) + .loginMember(showWaresDTO.getLoginMember()) + .build(); + waresAuthorityParentParamList.add(waresAuthorityParentParam); + } + if (bw.getAuthorityType() == EWaresPermissionType.PLACE_ALLWO.getValue() || bw.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) { + WaresAuthorityParentParam waresAuthorityParentParam = WaresAuthorityParentParam.builder() + .pkMember(bw.getPkMember()) + .loginMember(showWaresDTO.getLoginMember()) + .build(); + waresAuthorityPlaceParamList.add(waresAuthorityParentParam); + } } } } @@ -2967,19 +2969,21 @@ public class CuMemberServiceImpl extends ServiceImpl i for (ShowWaresDTO showWaresDTO : showWaresDTOS) { boolean isShowWares = true; - 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.PLACE_ALLWO.getValue()) { - // 安置可见 - isShowWares = waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); - } else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) { - // 安置禁止 - isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); + if (CollectionUtil.isNotEmpty(showWaresDTO.getWaresAuthorityList())) { + 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.PLACE_ALLWO.getValue()) { + // 安置可见 + isShowWares = waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); + } else if (bdWaresAuthority.getAuthorityType() == EWaresPermissionType.PLACE_STOP.getValue()) { + // 安置禁止 + isShowWares = !waresAuthorityPlaceList.contains(bdWaresAuthority.getPkMember()); + } } } resultMap.put(showWaresDTO.getPkWares(), isShowWares); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java index f1216dd0..fd913e38 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java @@ -93,11 +93,13 @@ public class ApiBdWaresController extends BaseController { /** + * 专区商品列表 + * * @param cuWaresParams 专区、分类 */ @RequestMapping("/query-spe-wares") public AjaxResult queryWaresBySpecial(@RequestBody CuWaresParams cuWaresParams) { - if (cuWaresParams.getSpecialArea() == null) { + if (null == cuWaresParams.getSpecialArea()) { return AjaxResult.error(SaOrderMsgConstants.SPECIAL_AREA_NOT_EMPTY); } @@ -213,7 +215,7 @@ public class ApiBdWaresController extends BaseController { 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())) { String gradeKey = waresExt.getPkId() + "_" + ERangeType.GRADE.getValue() + "_" + cuMember.getPkSettleGrade(); String awardsKey = waresExt.getPkId() + "_" + ERangeType.AWARDS.getValue() + "_" + cuMember.getPkAwards(); @@ -235,7 +237,8 @@ public class ApiBdWaresController extends BaseController { // 零售价 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) { if (waresExt.getPkId().intValue() == bdWaresRange.getPkWares().intValue()) { waresPrice = waresPrice.add(bdWaresRange.getPrice()); diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml index 8cff3641..d46f4867 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresMapper.xml @@ -87,13 +87,17 @@