xiaoyong931011
2021-04-22 4c75849f7c579147e20a3ce9e07d43375ceb4c2a
20210422 签到
3 files modified
5 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java 3 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 1 ●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html 1 ●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java
@@ -22,6 +22,9 @@
    
    @ApiModelProperty(value = "连续签到天数")
    private Integer cumulativeDay;
    @ApiModelProperty(value = "数量")
    private Integer scoreCnt;
    
    @ApiModelProperty(value = "奖励类型")
    private String awardType;
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml
@@ -15,6 +15,7 @@
        c.award_type awardType,
        c.award_name awardName,
        c.coupon_name couponName,
        c.score_cnt scoreCnt,
        c.award_rule awardRule
        FROM
        activity_sign_receive_record a
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html
@@ -128,6 +128,7 @@
                    <template slot-scope="scope">
                        {{scope.row.awardName}}
                        <span v-if="scope.row.awardType == 3">({{scope.row.couponName}})</span>
                        <span v-if="scope.row.awardType == 2">(*{{scope.row.scoreCnt}})</span>
                    </template>
                </el-table-column>
            </el-table>