Merge remote-tracking branch 'origin/user_action' into user_action

zxl

16 小时以前 d33b041f4b2a63a22682c9b3f344ef35f84b4542

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

@@ -2,12 +2,24 @@


import cn.lili.base.Result;
import cn.lili.cache.Cache;
import cn.lili.common.security.context.UserContext;
import cn.lili.modules.lmk.domain.form.ActivityRefPrizeForm;
import cn.lili.modules.lmk.domain.form.AddPrizeNumForm;
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 cn.lili.modules.lmk.service.PrizeService;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
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;
import java.util.concurrent.TimeUnit;

/**
 * lmk-shop-java
@@ -24,6 +36,18 @@

    private final PrizeActivityService prizeActivityService;

    private final ActivityRefPrizeService activityRefPrizeService;

    private final PrizeService prizeService;




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

    @GetMapping
    public Result getPage(PrizeActivityQuery query){
        return prizeActivityService.page(query);
@@ -32,16 +56,41 @@
    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);
    }

    /**
     * 增加抽奖次数
     *
     * @param addPrizeNumForm
     * @return
     */
    @PostMapping("/addPrizeNum")
    public Result addPrizeNum( @RequestBody AddPrizeNumForm addPrizeNumForm) {
        return prizeService.addPrizeNum(addPrizeNumForm);
    }
}