Merge branch 'refs/heads/feature_member_score' into dev

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/redeem/RedeemRewardController.java

@@ -28,6 +28,7 @@ import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -75,8 +76,8 @@ public class RedeemRewardController {
 
     @PostMapping("record/verify-back")
     @ApiOperation("核销回退")
-    public CommonResult<Boolean> verifyBack(@Valid @RequestBody List<Long> redeemIds) {
-        return success(rewardRedeemService.verifyBack(redeemIds));
+    public CommonResult<Boolean> verifyBack(@Valid @RequestBody List<String> redeemIds) {
+        return success(rewardRedeemService.verifyBack(redeemIds.stream().map(Long::valueOf).collect(Collectors.toList())));
     }
 
     @PostMapping("record/export")

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/app/redeem/AppRedeemRewardController.java

@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.reward.api.reward.RedeemRewardApi;
-import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardRespDTO;
 import cn.iocoder.yudao.module.reward.controller.app.redeem.vo.*;
 import cn.iocoder.yudao.module.reward.service.redeem.RewardRedeemService;
 import cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageRespVO;

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/app/redeem/vo/AppRewardRedeemDetailRespVO.java

@@ -32,6 +32,12 @@ public class AppRewardRedeemDetailRespVO {
     private Date startTime;
     @ApiModelProperty(value = "活动结束日期")
     private Date endTime;
+    @ApiModelProperty(value = "中文礼品图片")
+    private String imgZh;
+    @ApiModelProperty(value = "英文礼品图片")
+    private String imgEn;
+    @ApiModelProperty(value = "礼品单次兑换所需积分")
+    private Integer oncePointsRequire;
     @ApiModelProperty(value = "兑换方式")
     private Integer redeemType;
     @ApiModelProperty(value = "兑换网点(中文)")

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/vo/reward/RewardRedeemPageRespVO.java

@@ -47,4 +47,10 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
     private Date startTime;
     @ApiModelProperty(value = "活动结束日期")
     private Date endTime;
+    @ApiModelProperty(value = "中文礼品图片")
+    private String imgZh;
+    @ApiModelProperty(value = "英文礼品图片")
+    private String imgEn;
+    @ApiModelProperty(value = "礼品单次兑换所需积分")
+    private Integer oncePointsRequire;
 }

yudao-module-reward/yudao-module-reward-impl/src/main/resources/mapper/RewardRedeemMapper.xml

@@ -43,6 +43,9 @@
         er.points_require as pointsRequire,
         er.start_time as startTime,
         er.end_time as endTime,
+        er.img_zh as imgZh,
+        er.img_en as imgEn,
+        er.points_require as oncePointsRequire,
         <include refid="columns"/>
         from ecw_reward_redeem err
         left join ecw_reward er on err.reward_id = er.id