huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 07:11:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/develop' into develop

Browse Source
This commit is contained in:
puhui999 2024-10-04 13:59:11 +08:00
commit c74d85d940
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
View File

@ -290,7 +290,7 @@ public class CollectionUtils {
return valueFunc.apply(t); return valueFunc.apply(t);
} }
public static <T, V extends Comparable<? super V>> T getMinPropertyObj(List<T> from, Function<T, V> valueFunc) { public static <T, V extends Comparable<? super V>> T getMinObject(List<T> from, Function<T, V> valueFunc) {
if (CollUtil.isEmpty(from)) { if (CollUtil.isEmpty(from)) {
return null; return null;
} }
@ -298,7 +298,6 @@ public class CollectionUtils {
return from.stream().min(Comparator.comparing(valueFunc)).get(); return from.stream().min(Comparator.comparing(valueFunc)).get();
} }
public static <T, V extends Comparable<? super V>> V getSumValue(Collection<T> from, Function<T, V> valueFunc, public static <T, V extends Comparable<? super V>> V getSumValue(Collection<T> from, Function<T, V> valueFunc,
BinaryOperator<V> accumulator) { BinaryOperator<V> accumulator) {
return getSumValue(from, valueFunc, accumulator, null); return getSumValue(from, valueFunc, accumulator, null);

2
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/PointActivityController.java
View File

@ -129,7 +129,7 @@ public class PointActivityController {
List<PointActivityRespVO> result = BeanUtils.toBean(activityList, PointActivityRespVO.class); List<PointActivityRespVO> result = BeanUtils.toBean(activityList, PointActivityRespVO.class);
result.forEach(activity -> { result.forEach(activity -> {
// 设置 product 信息 // 设置 product 信息
PointProductDO minProduct = getMinPropertyObj(productsMap.get(activity.getId()), PointProductDO::getPoint); PointProductDO minProduct = getMinObject(productsMap.get(activity.getId()), PointProductDO::getPoint);
assert minProduct != null; assert minProduct != null;
activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice()); activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice());
findAndThen(spuMap, activity.getSpuId(), findAndThen(spuMap, activity.getSpuId(),

6
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/activity/PointActivityRespVO.java
View File

@ -26,9 +26,9 @@ public class PointActivityRespVO {
@ExcelProperty("活动状态") @ExcelProperty("活动状态")
private Integer status; private Integer status;
@Schema(description = "积分商城活动库存(剩余库存积分兑换时扣减)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @Schema(description = "积分商城活动库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("积分商城活动库存(剩余库存积分兑换时扣减)") @ExcelProperty("积分商城活动库存")
private Integer stock; private Integer stock; // 剩余库存积分兑换时扣减
@Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("积分商城活动总库存") @ExcelProperty("积分商城活动总库存")

2
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/AppPointActivityController.java
View File

@ -106,7 +106,7 @@ public class AppPointActivityController {
List<AppPointActivityRespVO> result = BeanUtils.toBean(activityList, AppPointActivityRespVO.class); List<AppPointActivityRespVO> result = BeanUtils.toBean(activityList, AppPointActivityRespVO.class);
result.forEach(activity -> { result.forEach(activity -> {
// 设置 product 信息 // 设置 product 信息
PointProductDO minProduct = getMinPropertyObj(productsMap.get(activity.getId()), PointProductDO::getPoint); PointProductDO minProduct = getMinObject(productsMap.get(activity.getId()), PointProductDO::getPoint);
assert minProduct != null; assert minProduct != null;
activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice()); activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice());
findAndThen(spuMap, activity.getSpuId(), findAndThen(spuMap, activity.getSpuId(),

1
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityPageReqVO.java
View File

@ -12,5 +12,4 @@ import lombok.ToString;
@ToString(callSuper = true) @ToString(callSuper = true)
public class AppPointActivityPageReqVO extends PageParam { public class AppPointActivityPageReqVO extends PageParam {
} }

8
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityRespVO.java
View File

@ -22,14 +22,16 @@ public class AppPointActivityRespVO {
@ExcelProperty("活动状态") @ExcelProperty("活动状态")
private Integer status; private Integer status;
@Schema(description = "积分商城活动库存(剩余库存积分兑换时扣减)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @Schema(description = "积分商城活动库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("积分商城活动库存(剩余库存积分兑换时扣减)") @ExcelProperty("积分商城活动库存")
private Integer stock; private Integer stock; // 剩余库存积分兑换时扣减
@Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("积分商城活动总库存") @ExcelProperty("积分商城活动总库存")
private Integer totalStock; private Integer totalStock;
// TODO @puhui999：只返回必要的字段，例如说 remark、sort、createTime 应该是不需要的呢。也可以看看别的也不需要哈。
@Schema(description = "备注", example = "你说的对") @Schema(description = "备注", example = "你说的对")
@ExcelProperty("备注") @ExcelProperty("备注")
private String remark; private String remark;