BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 7bff98b658fe498314cac283feb04074f400a27d

Authored by YunaiV
1 parent 633a4c56

统一 boot 和 cloud 代码

Inline Side-by-side
Showing 7 changed files with 15 additions and 14 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
  View file @7bff98b
... ... @@ -96,13 +96,13 @@ public class AppCouponTemplateController {
96 96 */
97 97 private Long getProductScopeValue(Integer productScope, Long spuId) {
98 98 // 通用券：没有商品范围
99   - if (productScope == null || ObjectUtils.equalsAny(productScope, PromotionProductScopeEnum.ALL.getScope(), null)) {
  99 + if (ObjectUtils.equalsAny(productScope, PromotionProductScopeEnum.ALL.getScope(), null)) {
100 100 return null;
101 101 }
102 102 // 品类券：查询商品的品类编号
103 103 if (Objects.equals(productScope, PromotionProductScopeEnum.CATEGORY.getScope()) && spuId != null) {
104   - return Optional.ofNullable(productSpuApi.getSpu(spuId))
105   - .map(ProductSpuRespDTO::getCategoryId).orElse(null);
  104 + ProductSpuRespDTO spu = productSpuApi.getSpu(spuId);
  105 + return spu != null ? spu.getCategoryId() : null;
106 106 }
107 107 // 商品卷：直接返回
108 108 return spuId;
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
  View file @7bff98b
... ... @@ -108,8 +108,8 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
108 108 }
109 109  
110 110 // 2. 校验商品 sku 都存在
111   - Map<Long, ProductSkuRespDTO> skuMap = convertMap(productSkuApi.getSkuListBySpuId(singletonList(spuId)),
112   - ProductSkuRespDTO::getId);
  111 + List<ProductSkuRespDTO> skus = productSkuApi.getSkuListBySpuId(singletonList(spuId));
  112 + Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
113 113 products.forEach(product -> {
114 114 if (!skuMap.containsKey(product.getSkuId())) {
115 115 throw exception(SKU_NOT_EXISTS);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
  View file @7bff98b
... ... @@ -7,7 +7,6 @@ import cn.hutool.core.util.ObjectUtil;
7 7 import cn.hutool.core.util.StrUtil;
8 8 import cn.hutool.extra.spring.SpringUtil;
9 9 import cn.iocoder.yudao.framework.common.pojo.PageResult;
10   -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
11 10 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
12 11 import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
13 12 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
... ... @@ -80,12 +79,11 @@ public class CouponServiceImpl implements CouponService {
80 79 public PageResult<CouponDO> getCouponPage(CouponPageReqVO pageReqVO) {
81 80 // 获得用户编号
82 81 if (StrUtil.isNotEmpty(pageReqVO.getNickname())) {
83   - Set<Long> userIds = CollectionUtils.convertSet(memberUserApi.getUserListByNickname(pageReqVO.getNickname()),
84   - MemberUserRespDTO::getId);
85   - if (CollUtil.isEmpty(userIds)) {
  82 + List<MemberUserRespDTO> users = memberUserApi.getUserListByNickname(pageReqVO.getNickname());
  83 + if (CollUtil.isEmpty(users)) {
86 84 return PageResult.empty();
87 85 }
88   - pageReqVO.setUserIds(userIds);
  86 + pageReqVO.setUserIds(convertSet(users, MemberUserRespDTO::getId));
89 87 }
90 88 // 分页查询
91 89 return couponMapper.selectPage(pageReqVO);
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
  View file @7bff98b
... ... @@ -123,8 +123,8 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
123 123 }
124 124  
125 125 // 2. 校验商品 sku 都存在
126   - Map<Long, ProductSkuRespDTO> skuMap = convertMap(productSkuApi.getSkuListBySpuId(singletonList(spuId)),
127   - ProductSkuRespDTO::getId);
  126 + List<ProductSkuRespDTO> skus = productSkuApi.getSkuListBySpuId(singletonList(spuId));
  127 + Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
128 128 products.forEach(product -> {
129 129 if (!skuMap.containsKey(product.getSkuId())) {
130 130 throw exception(SKU_NOT_EXISTS);
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
  View file @7bff98b
... ... @@ -77,6 +77,7 @@ public class BrokerageUserController {
77 77 @PreAuthorize("@ss.hasPermission('trade:brokerage-user:query')")
78 78 public CommonResult<BrokerageUserRespVO> getBrokerageUser(@RequestParam("id") Long id) {
79 79 BrokerageUserDO brokerageUser = brokerageUserService.getBrokerageUser(id);
  80 + // TODO @疯狂：是不是搞成一个统一的 convert？
80 81 BrokerageUserRespVO respVO = BrokerageUserConvert.INSTANCE.convert(brokerageUser);
81 82 return success(BrokerageUserConvert.INSTANCE.copyTo(memberUserApi.getUser(id), respVO));
82 83 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageUserServiceImpl.java
  View file @7bff98b
... ... @@ -232,7 +232,8 @@ public class BrokerageUserServiceImpl implements BrokerageUserService {
232 232 return PageResult.empty();
233 233 }
234 234 // 1.2 根据昵称过滤下级用户
235   - Map<Long, MemberUserRespDTO> userMap = convertMapByFilter(memberUserApi.getUserList(childIds),
  235 + List<MemberUserRespDTO> users = memberUserApi.getUserList(childIds);
  236 + Map<Long, MemberUserRespDTO> userMap = convertMapByFilter(users,
236 237 user -> StrUtil.contains(user.getNickname(), pageReqVO.getNickname()),
237 238 MemberUserRespDTO::getId);
238 239 if (CollUtil.isEmpty(userMap)) {
... ...
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/MemberUserApi.java
  View file @7bff98b
... ... @@ -38,7 +38,8 @@ public interface MemberUserApi {
38 38 * @return 会员用户 Map
39 39 */
40 40 default Map<Long, MemberUserRespDTO> getUserMap(Collection<Long> ids) {
41   - return convertMap(getUserList(ids), MemberUserRespDTO::getId);
  41 + List<MemberUserRespDTO> list = getUserList(ids);
  42 + return convertMap(list, MemberUserRespDTO::getId);
42 43 }
43 44  
44 45 /**
... ...