20220518

xiaoyong931011

2022-05-20 b2100bd0dd320e1a6e63c20d0b4bd46a6a333504

20220518

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java

@@ -180,6 +180,7 @@
            if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
            }else{
                apiMallAwardDetailsVo.setAwardName("未中奖");
            }
@@ -214,6 +215,7 @@
                        if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                            apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                            apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                            apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
                        }else{
                            apiMallAwardDetailsVo.setAwardName("未中奖");
                        }
@@ -259,6 +261,7 @@
                        apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
                        apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
                        apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
                        apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());

                        if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
                            prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -280,6 +283,7 @@
                    if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                        apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                        apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                        apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
                    }else{
                        apiMallAwardDetailsVo.setAwardName("未中奖");
                    }
@@ -301,6 +305,7 @@
                    if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                        apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                        apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                        apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
                    }else{
                        apiMallAwardDetailsVo.setAwardName("未中奖");
                    }
@@ -346,6 +351,7 @@
                    apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
                    apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
                    apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
                    apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());

                    if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
                        prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -384,6 +390,7 @@
                        if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                            apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                            apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                            apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
                        }else{
                            apiMallAwardDetailsVo.setAwardName("未中奖");
                        }
@@ -429,6 +436,7 @@
                        apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
                        apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
                        apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
                        apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());

                        if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
                            prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -450,6 +458,7 @@
                    if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                        apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                        apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                        apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
                    }else{
                        apiMallAwardDetailsVo.setAwardName("未中奖");
                    }
@@ -471,6 +480,7 @@
                    if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
                        apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
                        apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
                        apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
                    }else{
                        apiMallAwardDetailsVo.setAwardName("未中奖");
                    }
@@ -516,6 +526,7 @@
                    apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
                    apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
                    apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
                    apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());

                    if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
                        prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));

 src/main/java/cc/mrbird/febs/mall/vo/ApiMallAwardDetailsVo.java

@@ -8,6 +8,7 @@
@ApiModel(value = "ApiMallAwardDetailsVo", description = "返回参数类")
public class ApiMallAwardDetailsVo {

    private Long awardId;
    @ApiModelProperty(value = "奖品名称")
    private String awardName;
    @ApiModelProperty(value = "奖品图片")