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/app/redeem/AppRedeemRewardController.java

@@ -45,7 +45,7 @@ public class AppRedeemRewardController {
     @ApiOperation("兑换详情")
     //@PreAuthenticated
     public CommonResult<AppRewardRedeemDetailRespVO> detail(@Valid @RequestBody AppRewardRedeemDetailReqVO request) {
-        RewardRedeemPageRespVO detail = rewardRedeemService.detail(request.getRedeemId());
+        RewardRedeemPageRespVO detail = rewardRedeemService.detail(Long.valueOf(request.getRedeemId()));
         if (detail != null) {
             AppRewardRedeemDetailRespVO appRewardRedeemDetailRespVO = new AppRewardRedeemDetailRespVO();
             BeanUtils.copyProperties(detail, appRewardRedeemDetailRespVO);

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

@@ -11,5 +11,5 @@ import javax.validation.constraints.NotNull;
 public class AppRewardRedeemDetailReqVO {
     @ApiModelProperty(value = "兑换记录id")
     @NotNull(message = "兑换记录id不能为空")
-    private Long redeemId;
+    private String redeemId;
 }

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

 package cn.iocoder.yudao.module.reward.controller.app.redeem.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +12,7 @@ import java.util.Date;
 @ApiModel("客户端 - 礼品兑换记录详情 resp VO")
 public class AppRewardRedeemDetailRespVO {
     @ApiModelProperty(value = "id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     @ApiModelProperty(value = "会员id")
     private Long memberId;

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

 package cn.iocoder.yudao.module.reward.controller.app.redeem.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -19,6 +21,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @NoArgsConstructor
 public class AppRewardRedeemListRespVO {
     @ApiModelProperty(value = "id")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     @ApiModelProperty(value = "礼品ID")
     private Long rewardCode;