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/service/impl/NewFightIntegratingTaskServiceImpl.java

@@ -1,13 +1,17 @@
package com.panzhihua.service_dangjian.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.common.utlis.StringUtils;
import com.panzhihua.service_dangjian.dao.NewFightIntegratingTaskDao;
import com.panzhihua.service_dangjian.entity.IntegratingTask;
import com.panzhihua.service_dangjian.service.ComActIntegralUsersService;
import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

/**
@@ -20,6 +24,11 @@
public class NewFightIntegratingTaskServiceImpl extends ServiceImpl<NewFightIntegratingTaskDao,
        IntegratingTask> implements NewFightIntegratingTaskService
{


    @Resource
    private ComActIntegralUsersService usersService;


    @Override
    public List<IntegratingTask> getList(String userId, String communityId)
@@ -51,19 +60,38 @@
                //15查看微心愿
            case "16":
                //查看随手拍
            case "17":
                //每日签到
                IntegratingTask task=baseMapper.getDetails(item.getUserId(),item.getCommunityId(),item.getStatus());
                if(task!=null)
                {
                    return R.ok();
                }
                break;
            case "17":
                //每日签到
                IntegratingTask task2=baseMapper.getDetails(item.getUserId(),item.getCommunityId(),item.getStatus());
                if(task2!=null)
                {
                    return R.ok();
                }
                item.setIsDraw("2");
                break;
        }

        int num=baseMapper.addData(item);
        if(num>0)
        {
            if(StringUtils.equals("17",item.getStatus()))
            {
                NewFightIntegral integral=new NewFightIntegral();
                integral.setUserId(item.getUserId());
                integral.setCommunityId(item.getCommunityId());
                integral.setType("17");
                integral.setIntegralNum(item.getNum());
                usersService.upIntegral(integral);

                //新增每日用户签到记录
                baseMapper.addEverydayData(item);
            }
            return R.ok();
        }
        return R.fail("操作失败");
@@ -101,5 +129,21 @@
        return R.fail("操作失败");
    }

    @Override
    public List<IntegratingTask> getEverydayList(String userId, String communityId) {
        return baseMapper.getEverydayList(userId,communityId);
    }

    @Override
    public R addEverydayData(IntegratingTaskVO item)
    {
        int num= baseMapper.addEverydayData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }


}