Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightIntegratingTaskApi.java

@@ -1,9 +1,10 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO;
import com.panzhihua.service_dangjian.entity.IntegratingTask;
import com.panzhihua.service_dangjian.service.NewFightConvenientMerchantService;
import com.panzhihua.service_dangjian.service.ComActIntegralUsersService;
import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -18,6 +19,9 @@
{
    @Resource
    private NewFightIntegratingTaskService taskService;

    @Resource
    private ComActIntegralUsersService usersService;

    /**
     * 列表
@@ -42,4 +46,42 @@
        return taskService.addData(item);
    }


    /**
     * 添加或者修改积分
     * @param item
     * @return
     */
    @PostMapping("/upIntegral")
    public R upIntegral(@RequestBody NewFightIntegral item)
    {
        return usersService.upIntegral(item);
    }



    /**
     * 每日签到记录列表  前15条
     * @param userId
     * @param communityId
     * @return
     */
    @GetMapping("/getEverydayList")
    public R  getEverydayList(@RequestParam("userId") String userId,
                              @RequestParam("communityId") String communityId)
    {
        return R.ok(taskService.getEverydayList(userId,communityId));
    }


    /**
     *  每日定时清空
     */
    @GetMapping("/everydaYtruncateData")
    public R truncateData()
    {
        return taskService.truncateData();
    }


}