奖品,抽奖活动bug改动，商家入驻密码重置111111

zxl

昨天 7433322e94209c63bd6257dd4bf3b24be0452325

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

@@ -2,12 +2,18 @@


import cn.lili.base.Result;
import cn.lili.modules.lmk.domain.form.ActivityRefPrizeForm;
import cn.lili.modules.lmk.domain.form.PrizeActivityForm;
import cn.lili.modules.lmk.domain.query.PrizeActivityQuery;
import cn.lili.modules.lmk.service.ActivityRefPrizeService;
import cn.lili.modules.lmk.service.PrizeActivityService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;
import javax.validation.constraints.Size;
import java.util.List;

/**
 * lmk-shop-java
@@ -24,6 +30,7 @@

    private final PrizeActivityService prizeActivityService;

    private final ActivityRefPrizeService activityRefPrizeService;
    @GetMapping
    public Result getPage(PrizeActivityQuery query){
        return prizeActivityService.page(query);
@@ -32,16 +39,30 @@
    public Result detail(@PathVariable("id") String id){
        return prizeActivityService.detail(id);
    }
    @PutMapping
    public Result edit(@RequestBody PrizeActivityForm form){
        return prizeActivityService.update(form);
    }
//    @PutMapping
//    public Result edit(@RequestBody PrizeActivityForm form){
//        return prizeActivityService.update(form);
//    }
    @PostMapping
    public Result add(@RequestBody PrizeActivityForm form){
        return prizeActivityService.add(form);
    }
    @DeleteMapping("/{id}")
    public Result del(@PathVariable("id") String id){
        return prizeActivityService.removeById(id);
//    @DeleteMapping("/{id}")
//    public Result del(@PathVariable("id") String id){
//        return prizeActivityService.removeById(id);
//    }
    @PostMapping("/addActivityRefPrizeList/{id}")
    public Result addListByPrizeDraw(@PathVariable("id") String prizeActivityId,@RequestBody @Valid @Size(max = 5, message = "奖品数量必须在1到5个之间")  List<ActivityRefPrizeForm> list){
        return activityRefPrizeService.addList(prizeActivityId,list);
    }

    @GetMapping("/getActivityRefPrizeByActivityId/{id}")
    public Result getActivityRefPrizeByActivityId(@PathVariable("id") String prizeActivityId){
        return activityRefPrizeService.getActivityRefPrizeByActivityId(prizeActivityId);
    }

    @PutMapping("/publishPrizeActivity/{id}")
    public Result publishPrizeActivity(@PathVariable("id") String id){
        return prizeActivityService.publishPrizeActivity(id);
    }
}