lidongdong
2023-11-20 e83501edf6b6595592e432aeac6bfa83c1f21af8
用户积分任务  积分任务领取   积分添加模块
5个文件已修改
111 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightIntegratingTaskDao.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightIntegratingTaskService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightIntegratingTaskServiceImpl.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewStriveIntegratingTaskMapper.xml 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightIntegratingTaskDao.java
@@ -19,6 +19,10 @@
    List<IntegratingTask> getList(@Param("userId") String userId,
                                  @Param("communityId") String communityId);
    IntegratingTask getDetails(@Param("userId") String userId,
                               @Param("communityId") String communityId,
                               @Param("status") String status);
    /**
     * 新增
     * @param
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/NewFightIntegratingTaskService.java
@@ -24,6 +24,10 @@
     */
    List<IntegratingTask> getList(String userId,String communityId);
    IntegratingTask getDetails(String userId,String communityId,String status);
    /**
     * 新增
     * @param
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
@@ -9,6 +9,7 @@
import com.panzhihua.service_dangjian.dao.ComActIntegralUsersMapper;
import com.panzhihua.service_dangjian.entity.ComActIntegralUser;
import com.panzhihua.service_dangjian.entity.ComActIntegralUserTrade;
import com.panzhihua.service_dangjian.entity.IntegratingTask;
import com.panzhihua.service_dangjian.service.ComActIntegralUserChangeDAOService;
import com.panzhihua.service_dangjian.service.ComActIntegralUserTradeDaoService;
import com.panzhihua.service_dangjian.service.ComActIntegralUsersService;
@@ -39,6 +40,7 @@
    @Resource
    private NewFightIntegratingTaskService taskService;
    @Override
    public R upIntegral(NewFightIntegral item)
@@ -113,6 +115,14 @@
                break;
            case "11":
                //花城登录
                IntegratingTask task=taskService.getDetails(item.getUserId(),
                        item.getCommunityId(),item.getType());
                if(task!=null && StringUtils.equals("2",task.getIsDraw()) )
                {
                    return R.ok();
                }
                item.setAddOrReduce(1);
                item.setIntegralNum("2");
@@ -131,18 +141,23 @@
                //15查看微心愿
            case "16":
                //查看随手拍
//                item.setAddOrReduce(1);
//                item.setIntegralNum("1");
//                break;
            case "17":
                //每日签到
                IntegratingTask task2=taskService.getDetails(item.getUserId(),
                        item.getCommunityId(),item.getType());
                if(task2!=null && StringUtils.equals("2",task2.getIsDraw()) )
                {
                    return R.ok();
                }
                item.setAddOrReduce(1);
                item.setIntegralNum("1");
                IntegratingTaskVO taskVO2=new IntegratingTaskVO();
                taskVO2.setIsDraw("2");
                taskVO2.setId(item.getTaskId());
                taskService.editData(taskVO2);
                break;
            case "17":
                //每日签到
                item.setAddOrReduce(1);
                item.setIntegralNum("1");
                break;
            case "18":
                //上传“随手拍”或“微心愿
@@ -150,9 +165,6 @@
                item.setIntegralNum("2");
                break;
        }
        // 根据不同身份,计算钱包金额
//        if (identityType.equals(ComActIntegralUserTrade.identityType.jm)) {
@@ -179,6 +191,23 @@
//        }
        //积分总数加减
        if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.reduce)
        {
            int integralResidentNow = addIntegral(integralResident + amount);
            integralUserDO.setIntegralResident(integralResidentNow);
            integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() + amount));
        }
        else {
            int integralResidentNow = addIntegral(integralResident - amount);
            integralUserDO.setIntegralResident(integralResidentNow);
            integralUserDO.setIntegralAvailableResident(addIntegral(integralUserDO.getIntegralAvailableResident() - amount));
        }
        //积分总数加减
        if (item.getAddOrReduce() == ComActIntegralUserTrade.changeType.reduce)
        {
            integralUserDO.setIntegralSum(addIntegral(integralSum - amount));
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightIntegratingTaskServiceImpl.java
@@ -27,10 +27,40 @@
        return baseMapper.getList(userId,communityId);
    }
    @Override
    public IntegratingTask getDetails(String userId, String communityId, String status) {
        return baseMapper.getDetails(userId,communityId,status);
    }
    @Override
    public R addData(IntegratingTaskVO item)
    {
        switch (item.getStatus())
        {
            case "11":
                //花城登录
            case "12":
                // 查看问题清单
            case "13":
                //13查看需求清单
            case "14":
                //查看报道服务活动
            case "15":
                //15查看微心愿
            case "16":
                //查看随手拍
            case "17":
                //每日签到
                IntegratingTask task=baseMapper.getDetails(item.getUserId(),item.getCommunityId(),item.getStatus());
                if(task!=null)
                {
                    return R.ok();
                }
                break;
        }
        int num=baseMapper.addData(item);
        if(num>0)
        {
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewStriveIntegratingTaskMapper.xml
@@ -33,6 +33,32 @@
        </where>
    </select>
    <!-- 分页查询 -->
    <select id="getDetails" resultMap="itemMap">
        select
        id,
        is_draw,
        status,
        user_id,
        community_id,
        creation_time
        from new_strive_integrating_task
        <where>
            1=1
            <if test="communityId !=null and communityId !='' ">
                and community_id=#{communityId}
            </if>
            <if test="userId !=null and userId !='' ">
                and user_id=#{userId}
            </if>
            <if test="status !=null and status !='' ">
                and status=#{status}
            </if>
        </where>
        LIMIT 1
    </select>
    <insert id="addData">
        insert into new_strive_integrating_task