表名

zxl

23 小时以前 18c28c7f440c45855a1bc20626d296d6aeef32c1

表名

 framework/src/main/java/cn/lili/modules/lmk/domain/query/PrizeClaimRecordQuery.java

@@ -18,5 +18,6 @@
@Data
@ApiModel(value = "PrizeClaimRecord查询参数", description = "店铺抽奖活动领取表查询参数")
public class PrizeClaimRecordQuery extends AbsQuery {
    private String storePrizeId;
}


 framework/src/main/java/cn/lili/modules/lmk/domain/vo/PrizeClaimRecordVO.java

@@ -26,7 +26,7 @@

    /** 店铺id */
    @ApiModelProperty("店铺id")
    private Long storeId;
    private String storeId;

    /** 店铺名称 */
    @ApiModelProperty("店铺名称")
@@ -34,7 +34,7 @@

    /** 抽奖活动id */
    @ApiModelProperty("抽奖活动id")
    private Long prizeActivityId;
    private String prizeActivityId;

    /** 抽奖活动名称 */
    @ApiModelProperty("抽奖活动名称")
@@ -42,7 +42,7 @@

    /** 用户id */
    @ApiModelProperty("用户id")
    private Long userId;
    private String userId;

    /** 用户昵称 */
    @ApiModelProperty("用户昵称")

 framework/src/main/java/cn/lili/modules/lmk/domain/vo/ScanPrizeVO.java

@@ -52,6 +52,8 @@
    @ApiModelProperty("是否启用")
    private String status;

    private String material;

    public static ScanPrizeVO getVoByEntity(@NonNull ScanPrize entity, ScanPrizeVO vo) {
        if(vo == null) {
            vo = new ScanPrizeVO();

 framework/src/main/java/cn/lili/modules/lmk/enums/general/MaterialStatusEnum.java

@@ -4,8 +4,8 @@

@AllArgsConstructor
public enum MaterialStatusEnum {
    NOT_GENERATE("没有生成"),
    GENERATE("生成");
    NOT_GENERATE("没有补充"),
    GENERATE("已补充");

    private String des;


 framework/src/main/resources/mapper/lmk/PrizeClaimRecordMapper.xml

@@ -54,6 +54,9 @@
            lmk_prize_claim_record LPCR
        WHERE
            LPCR.delete_flag = 0
        <if test="query.storePrizeId !=null and query.storePrizeId !=''">
            AND LPCR.store_prize_id = #{query.storePrizeId}
        </if>
    </select>

</mapper>

 framework/src/main/resources/mapper/lmk/ScanPrizeMapper.xml

@@ -13,6 +13,7 @@
        <result column="generate_num" property="generateNum" />
        <result column="claim_num" property="claimNum" />
        <result column="status" property="status" />
        <result column="material" property="material"/>
    </resultMap>


@@ -49,6 +50,7 @@
            LSP.generate_num,
            LSP.claim_num,
            LSP.status,
            LSP.material,
            LSP.id
        FROM
            lmk_scan_prize LSP

 manager-api/src/main/java/cn/lili/controller/lmk/ScanPrizeController.java

@@ -2,6 +2,8 @@

import cn.lili.group.Update;
import cn.lili.group.Add;
import cn.lili.modules.lmk.domain.query.PrizeClaimRecordQuery;
import cn.lili.modules.lmk.service.PrizeClaimRecordService;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;
@@ -31,7 +33,7 @@
public class ScanPrizeController {

    private final ScanPrizeService scanPrizeService;

    private final PrizeClaimRecordService prizeClaimRecordService;

    @PutMapping
    @ApiOperation(value = "修改", notes = "修改")
@@ -95,4 +97,11 @@
    public Result generateStorePrize(@PathVariable String id){
        return  scanPrizeService.generateStorePrize(id);
    }


    @GetMapping("/getClaimPage")
    public Result getClaimPage(PrizeClaimRecordQuery query){
        return prizeClaimRecordService.page(query);
    }

}