bug修改

mitao

2025-01-17 afa0dbb4f54e7244835dd67ec33c3e545f122f71

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java

@@ -1,13 +1,16 @@
package com.ruoyi.goods.controller.concole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.poji.activity.Activity;
import com.ruoyi.goods.service.activity.ActivityGoodsService;
import com.ruoyi.goods.service.activity.ActivityRecordService;
import com.ruoyi.goods.service.activity.ActivityService;
import com.ruoyi.system.api.domain.dto.AGStockChangeDto;
import com.ruoyi.system.api.domain.dto.ActivityGoodsGetDto;
import com.ruoyi.system.api.domain.dto.ActivityTotalChangeDto;
import com.ruoyi.system.api.domain.dto.MerActivityShopDto;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.activity.ActivityRecord;
import com.ruoyi.system.api.domain.vo.ActivityGoodsGetVo;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import org.springframework.web.bind.annotation.PostMapping;
@@ -102,6 +105,7 @@
     */
    @PostMapping("/startActivity")
    public R startActivity(@RequestBody String activityId){

        activityService.startActivity(activityId);
        return R.ok();
    }
@@ -144,4 +148,56 @@
        activityService.changeActivityTotal(activityTotalChangeDto);
        return R.ok();
    }

    /**
     * @description  添加活动记录
     * @author  jqs
     * @date    2023/7/25 14:00
     * @param activityRecord
     * @return  R
     */
    @PostMapping("/addActivityRecord")
    public R addActivityRecord(@RequestBody ActivityRecord activityRecord){
        activityRecordService.save(activityRecord);
        return R.ok();
    }

    /**
     * @description  删除活动记录
     * @author  jqs
     * @date    2023/7/25 14:23
     * @param activityRecord
     * @return  R
     */
    @PostMapping("/delActivityRecord")
    public R delActivityRecord(@RequestBody ActivityRecord activityRecord){
        activityRecordService.delActivityRecord(activityRecord);
        return R.ok();
    }

    /**
     * @description  判断商户是否在活动范围
     * @author  jqs
     * @date    2023/9/7 14:12
     * @param merActivityShopDto
     * @return  R<Boolean>
     */
    @PostMapping("/judgeActivityShop")
    public R<Boolean> judgeActivityShop(@RequestBody MerActivityShopDto merActivityShopDto){
        Boolean judge = activityService.judgeActivityShop(merActivityShopDto);
        return R.ok(judge);
    }

    /**
     * @description  通过id获取活动
     * @author  jqs
     * @date    2023/9/20 20:05
     * @param activityId
     * @return  R<Activity>
     */
    @PostMapping("/getActivity")
    public R<Activity> getActivity(@RequestBody String activityId){
        Activity activity = activityService.getById(activityId);
        return R.ok(activity);
    }
}