Helius
2022-06-17 07601ba7452985ad8d206adb48a64c617cbfe11f
Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
2 files modified
7 ■■■■■ changed files
src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java 6 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallActWinRecordMapper.xml 1 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/ApiMallActWinDetailsVo.java
@@ -1,8 +1,11 @@
package cc.mrbird.febs.mall.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel(value = "ApiMallActWinDetailsVo", description = "返回参数类")
@@ -16,5 +19,8 @@
    private Integer awardType;
    @ApiModelProperty(value = "获得积分或佣金数量(奖金)")
    private Integer awardValue;
    @ApiModelProperty(value = "中奖时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date createdTime;
}
src/main/resources/mapper/modules/MallActWinRecordMapper.xml
@@ -12,6 +12,7 @@
        a.award_name awardName,
        a.award_type awardType,
        a.award_value awardValue,
        a.created_time createdTime,
        b.award_image awardImage
        from mall_act_win_record a
        left join mall_act_award_set b on a.award_id = b.id