lidongdong
2023-08-25 3c83f81b6889d024541e6c0b03be1d54c683502b
修改小程序商品兑换列表报错
6个文件已修改
27 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerActivityDao.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivity.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerActivityService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerActivityMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java
@@ -27,7 +27,7 @@
    @GetMapping("/queryById")
    public R queryById(@RequestParam("id") String id)
    {
        return R.ok(volunteerActivityService.queryById(id));
        return R.ok(volunteerActivityService.queryById(id,getUserId()+""));
    }
    /**
@@ -45,7 +45,7 @@
                                       @RequestParam(value = "actityEndTime", required = false) Date actityEndTime)
    {
        return R.ok(volunteerActivityService.queryList(pageNum,  pageSize, name, acState, acType, actityBeginTime, actityEndTime));
        return R.ok(volunteerActivityService.queryList(pageNum,  pageSize, name, acState,getUserId()+"", acType, actityBeginTime, actityEndTime));
    }
    /**
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerActivityDao.java
@@ -20,7 +20,7 @@
     * @param id
     * @return
     */
    VolunteerActivity queryById(@Param("id") String id);
    VolunteerActivity queryById(@Param("id") String id,@Param("userId") String userId);
    /**
     * 分页查询
@@ -31,6 +31,7 @@
                                       @Param("name") String name,
                                       @Param("acState") String acState,
                                       @Param("acType") String acType,
                                       @Param("userId") String userId,
                                       @Param("actityBeginTime") Date actityBeginTime,
                                       @Param("actityEndTime") Date actityEndTime);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivity.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -145,6 +146,10 @@
    @ApiModelProperty(value = "经度")
    private String lng;
    @TableField(exist = false)
    @ApiModelProperty(value = "是否参与活动  0未参与 1参与")
    private String isSign;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerActivityService.java
@@ -16,7 +16,7 @@
     * @param id
     * @return
     */
    VolunteerActivity queryById( String id);
    VolunteerActivity queryById( String id,String userId);
    /**
     * 分页查询
@@ -27,6 +27,7 @@
                                       String name,
                                       String acState,
                                       String acType,
                                       String userId,
                                       Date actityBeginTime,
                                       Date actityEndTime);
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerActivityServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.service_community.entity.VolunteerActivity;
import com.panzhihua.service_community.service.VolunteerActivityService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -23,8 +24,8 @@
{
    @Override
    public VolunteerActivity queryById(String Id) {
        return baseMapper.queryById(Id);
    public VolunteerActivity queryById(String Id,String userId) {
        return baseMapper.queryById(Id,userId);
    }
    @Override
@@ -32,11 +33,12 @@
                                              String name,
                                              String acState,
                                              String acType,
                                              String userId,
                                              Date actityBeginTime,
                                              Date actityEndTime)
    {
        Page page = new Page<VolunteerActivity>(pageNum,pageSize);
        return baseMapper.queryList(page, name, acState, acType, actityBeginTime, actityEndTime);
        return baseMapper.queryList(page, name, acState, acType, userId, actityBeginTime, actityEndTime);
    }
    @Override
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerActivityMapper.xml
@@ -39,6 +39,8 @@
            address,
            (select count(id) from volunteer_activities_people_involved where activity_id=volunteer_activity.id) as volunteer_num,
            ac_state,
            (if((select count(id) from volunteer_activities_people_involved
                 where activity_id=volunteer_activity.id and user_id=#{userId})>0,1,0)) as isSign,
            award_state,
            issue_time,
            apply_begin_time,
@@ -70,6 +72,8 @@
            address,
            (select count(id) from volunteer_activities_people_involved where activity_id=volunteer_activity.id) as volunteer_num,
            ac_state,
            (if((select count(id) from volunteer_activities_people_involved
                where activity_id=volunteer_activity.id and user_id=#{userId})>0,1,0)) as isSign,
            award_state,
            issue_time,
            apply_begin_time,