Commit f6a6a1ff88c4b81cdfbf71652b51ef76d0efc888

Authored by YunaiV
1 parent b849194d

【代码评审】商城:积分商城的 review

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
@@ -290,7 +290,7 @@ public class CollectionUtils { @@ -290,7 +290,7 @@ public class CollectionUtils {
290 return valueFunc.apply(t); 290 return valueFunc.apply(t);
291 } 291 }
292 292
293 - public static <T, V extends Comparable<? super V>> T getMinPropertyObj(List<T> from, Function<T, V> valueFunc) { 293 + public static <T, V extends Comparable<? super V>> T getMinObject(List<T> from, Function<T, V> valueFunc) {
294 if (CollUtil.isEmpty(from)) { 294 if (CollUtil.isEmpty(from)) {
295 return null; 295 return null;
296 } 296 }
@@ -298,7 +298,6 @@ public class CollectionUtils { @@ -298,7 +298,6 @@ public class CollectionUtils {
298 return from.stream().min(Comparator.comparing(valueFunc)).get(); 298 return from.stream().min(Comparator.comparing(valueFunc)).get();
299 } 299 }
300 300
301 -  
302 public static <T, V extends Comparable<? super V>> V getSumValue(Collection<T> from, Function<T, V> valueFunc, 301 public static <T, V extends Comparable<? super V>> V getSumValue(Collection<T> from, Function<T, V> valueFunc,
303 BinaryOperator<V> accumulator) { 302 BinaryOperator<V> accumulator) {
304 return getSumValue(from, valueFunc, accumulator, null); 303 return getSumValue(from, valueFunc, accumulator, null);
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/PointActivityController.java
@@ -129,7 +129,7 @@ public class PointActivityController { @@ -129,7 +129,7 @@ public class PointActivityController {
129 List<PointActivityRespVO> result = BeanUtils.toBean(activityList, PointActivityRespVO.class); 129 List<PointActivityRespVO> result = BeanUtils.toBean(activityList, PointActivityRespVO.class);
130 result.forEach(activity -> { 130 result.forEach(activity -> {
131 // 设置 product 信息 131 // 设置 product 信息
132 - PointProductDO minProduct = getMinPropertyObj(productsMap.get(activity.getId()), PointProductDO::getPoint); 132 + PointProductDO minProduct = getMinObject(productsMap.get(activity.getId()), PointProductDO::getPoint);
133 assert minProduct != null; 133 assert minProduct != null;
134 activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice()); 134 activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice());
135 findAndThen(spuMap, activity.getSpuId(), 135 findAndThen(spuMap, activity.getSpuId(),
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/activity/PointActivityRespVO.java
@@ -26,9 +26,9 @@ public class PointActivityRespVO { @@ -26,9 +26,9 @@ public class PointActivityRespVO {
26 @ExcelProperty("活动状态") 26 @ExcelProperty("活动状态")
27 private Integer status; 27 private Integer status;
28 28
29 - @Schema(description = "积分商城活动库存(剩余库存积分兑换时扣减)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")  
30 - @ExcelProperty("积分商城活动库存(剩余库存积分兑换时扣减)")  
31 - private Integer stock; 29 + @Schema(description = "积分商城活动库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  30 + @ExcelProperty("积分商城活动库存")
  31 + private Integer stock; // 剩余库存积分兑换时扣减
32 32
33 @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") 33 @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
34 @ExcelProperty("积分商城活动总库存") 34 @ExcelProperty("积分商城活动总库存")
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/AppPointActivityController.java
@@ -102,7 +102,7 @@ public class AppPointActivityController { @@ -102,7 +102,7 @@ public class AppPointActivityController {
102 List<AppPointActivityRespVO> result = BeanUtils.toBean(activityList, AppPointActivityRespVO.class); 102 List<AppPointActivityRespVO> result = BeanUtils.toBean(activityList, AppPointActivityRespVO.class);
103 result.forEach(activity -> { 103 result.forEach(activity -> {
104 // 设置 product 信息 104 // 设置 product 信息
105 - PointProductDO minProduct = getMinPropertyObj(productsMap.get(activity.getId()), PointProductDO::getPoint); 105 + PointProductDO minProduct = getMinObject(productsMap.get(activity.getId()), PointProductDO::getPoint);
106 assert minProduct != null; 106 assert minProduct != null;
107 activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice()); 107 activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice());
108 findAndThen(spuMap, activity.getSpuId(), 108 findAndThen(spuMap, activity.getSpuId(),
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityPageReqVO.java
@@ -12,5 +12,4 @@ import lombok.ToString; @@ -12,5 +12,4 @@ import lombok.ToString;
12 @ToString(callSuper = true) 12 @ToString(callSuper = true)
13 public class AppPointActivityPageReqVO extends PageParam { 13 public class AppPointActivityPageReqVO extends PageParam {
14 14
15 -  
16 } 15 }
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityRespVO.java
@@ -22,14 +22,16 @@ public class AppPointActivityRespVO { @@ -22,14 +22,16 @@ public class AppPointActivityRespVO {
22 @ExcelProperty("活动状态") 22 @ExcelProperty("活动状态")
23 private Integer status; 23 private Integer status;
24 24
25 - @Schema(description = "积分商城活动库存(剩余库存积分兑换时扣减)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")  
26 - @ExcelProperty("积分商城活动库存(剩余库存积分兑换时扣减)")  
27 - private Integer stock; 25 + @Schema(description = "积分商城活动库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  26 + @ExcelProperty("积分商城活动库存")
  27 + private Integer stock; // 剩余库存积分兑换时扣减
28 28
29 @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") 29 @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
30 @ExcelProperty("积分商城活动总库存") 30 @ExcelProperty("积分商城活动总库存")
31 private Integer totalStock; 31 private Integer totalStock;
32 32
  33 + // TODO @puhui999:只返回必要的字段,例如说 remark、sort、createTime 应该是不需要的呢。也可以看看别的也不需要哈。
  34 +
33 @Schema(description = "备注", example = "你说的对") 35 @Schema(description = "备注", example = "你说的对")
34 @ExcelProperty("备注") 36 @ExcelProperty("备注")
35 private String remark; 37 private String remark;