更新

zxl

昨天 f3450326233f27338b3658f4b6664f3a279c6f8a

更新

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

@@ -52,6 +52,8 @@
    @ApiModelProperty("领取状态")
    private String claimStatus;

    private String material;

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

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

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

    private String material;

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

 framework/src/main/java/cn/lili/modules/lmk/service/ScanPrizeService.java

@@ -48,7 +48,7 @@
     * @param query
     * @return
     */
    Result page(ScanPrizeQuery query);
    Result page(ScanPrizeQuery query,String form);

    /**
     * 根据id查找

 framework/src/main/java/cn/lili/modules/lmk/service/impl/ScanPrizeServiceImpl.java

@@ -26,6 +26,7 @@
import cn.lili.modules.lmk.domain.form.ScanPrizeForm;
import cn.lili.modules.lmk.domain.vo.ScanPrizeVO;
import cn.lili.modules.lmk.domain.query.ScanPrizeQuery;
import groovyjarjarpicocli.CommandLine;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
@@ -118,13 +119,19 @@
     * @return
     */
    @Override
    public Result page(ScanPrizeQuery query) {

    public Result page(ScanPrizeQuery query,String form) {
        IPage<ScanPrizeVO> page = PageUtil.getPage(query, ScanPrizeVO.class);
        LambdaQueryWrapper<ScanPrize> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(Objects.nonNull(query.getStoreId()), ScanPrize::getStoreId, query.getStoreId());
        wrapper.eq(StringUtils.isNotBlank(query.getStatus()), ScanPrize::getStatus, query.getStatus());
        wrapper.eq(StringUtils.isNotBlank(query.getGenerateStatus()), ScanPrize::getGenerateStatus, query.getGenerateStatus());
        if("seller".equals(form)){
            String storeId = UserContext.getCurrentUser().getStoreId();
            if (StringUtils.isNotBlank(storeId)){
                wrapper.eq(ScanPrize::getStoreId, storeId);
            }
        }

        baseMapper.getPage(page, query);
        return Result.ok().data(page.getRecords()).total(page.getTotal());
    }

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

@@ -13,6 +13,7 @@
        <result column="user_id" property="userId" />
        <result column="nick_name" property="nickName" />
        <result column="claim_status" property="claimStatus" />
        <result column="material" property="material"/>
    </resultMap>


@@ -49,6 +50,7 @@
            LPCR.user_id,
            LPCR.nick_name,
            LPCR.claim_status,
            LPCR.material,
            LPCR.id
        FROM
            lmk_prize_claim_record LPCR

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

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


@@ -50,7 +49,6 @@
            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

@@ -56,7 +56,7 @@
    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(ScanPrizeQuery query) {
        return scanPrizeService.page(query);
        return scanPrizeService.page(query,"manager");
    }

    @GetMapping("/{id}")

 seller-api/src/main/java/cn/lili/controller/activity/StorePrizeClaimController.java

New file
@@ -0,0 +1,30 @@
package cn.lili.controller.activity;


import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.query.ScanPrizeQuery;
import cn.lili.modules.lmk.service.ScanPrizeService;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * lmk-shop-java
 *
 * @author : zxl
 * @date : 2025-09-30 17:03
 **/
@RequiredArgsConstructor
@RestController
@RequestMapping("/store/lmk/scan-prize")
public class StorePrizeClaimController {
    private final ScanPrizeService scanPrizeService;

    @GetMapping("/page")
    @ApiOperation(value = "分页", notes = "分页")
    public Result page(ScanPrizeQuery query) {
        return scanPrizeService.page(query,"seller");
    }
}