新增积分商城模块(新增商品   编辑商品  删除商品   商品列表)   修改活动人员统计为0   修改小程序活动报名报错
8个文件已添加
7个文件已修改
779 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivityVO.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java 68 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralRecordApi.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerIntegralMerchantDao.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerIntegralMerchant.java 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerIntegralMerchantService.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerActivityMapper.xml 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerIntegralMerchantMapper.xml 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/VolunteerActivitiesPeopleApi.java
@@ -235,6 +235,39 @@
        return volunteerActivitiesPeople.VolunteerIntegralRecordDeleteId(id);
    }
    /****************************************************************************************************
     *
     *
     *                路北积分商城
     *
     *
     ***************************************************************************************************/
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryById(id);
    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                                                @RequestParam("pageSize")  int pageSize,
                                                @RequestParam("name")  String name,
                                                @RequestParam("state")  String state)
    {
        return volunteerActivitiesPeople.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerActivityVO.java
@@ -106,7 +106,7 @@
     * 活动封面
     */
    @ApiModelProperty(value = "活动封面")
    private String activitCoverUrl;
    private String activityCoverUrl;
    /**
     * 活动内容
     */
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerIntegralMerchantVO.java
New file
@@ -0,0 +1,84 @@
package com.panzhihua.common.model.vos.community;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("爱心积分商城")
public class VolunteerIntegralMerchantVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * 活动名称
     */
    @ApiModelProperty(value = "活动名称")
    private String name;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private String communityId;
    /**
     * 商品价值
     */
    @ApiModelProperty(value = "商品价值")
    private String commodityValue;
    /**
     * 所需积分
     */
    @ApiModelProperty(value = "所需积分")
    private String integral;
    /**
     * 上架状态 0下架  1上架
     */
    @ApiModelProperty(value = "上架状态 0下架  1上架")
    private String state;
    /**
     * 商品封面url
     */
    @ApiModelProperty(value = "商品封面url")
    private String coverUrl;
    /**
     * 商品详情
     */
    @ApiModelProperty(value = "商品详情")
    private String content;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -11471,5 +11471,47 @@
    @DeleteMapping("/VolunteerIntegralRecord/deleteId")
    public R VolunteerIntegralRecordDeleteId(@RequestParam("id") String id);
    /*************************************************************************************************************
     *
     *
     *                            路北社区积分商城
     *
     *
     ****************************************************************************************************************/
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id);
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/VolunteerIntegralMerchant/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam("name")  String name,
                       @RequestParam("state")  String state);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/VolunteerIntegralMerchant/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO);
    @PostMapping("/VolunteerIntegralMerchant/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO);
    @DeleteMapping("/VolunteerIntegralMerchant/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/VolunteerIntegralMerchantApi.java
New file
@@ -0,0 +1,68 @@
package com.panzhihua.community_backstage.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.common.service.community.CommunityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@Slf4j
@RestController
@RequestMapping("/VolunteerIntegralMerchant")
public class VolunteerIntegralMerchantApi extends BaseController
{
    @Resource
    private CommunityService merchantService;
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    @GetMapping("/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
    {
        return R.ok(merchantService.VolunteerIntegralMerchantQueryById(id));
    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam("name")  String name,
                       @RequestParam("state")  String state)
    {
        return R.ok(merchantService.VolunteerIntegralMerchantQueryList(pageNum,pageSize,name,state));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        return merchantService.VolunteerIntegralMerchantInsertVolunteer(vimVO);
    }
    @PostMapping("/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        return merchantService.VolunteerIntegralMerchantUpdateById(vimVO);
    }
    @DeleteMapping("/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id)
    {
        return merchantService.VolunteerIntegralMerchantDeleteById(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerActivityApi.java
@@ -1,7 +1,9 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerActivityVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.service.VolunteerActivityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -12,7 +14,7 @@
@Slf4j
@RestController
@RequestMapping("/Volunteer")
public class VolunteerActivityApi
public class VolunteerActivityApi extends BaseController
{
    @Resource
    private VolunteerActivityService volunteerActivityService;
@@ -54,6 +56,10 @@
    @PostMapping("/insertVolunteer")
    R insertVolunteer(@RequestBody VolunteerActivityVO volunteerActivityVO)
    {
        if(StringUtils.isEmpty(volunteerActivityVO.getCommunityId()))
        {
            volunteerActivityVO.setCommunityId(getCommunityId()+"");
        }
        int num = volunteerActivityService.insertVolunteer(volunteerActivityVO);
        if(num>0)
        {
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
New file
@@ -0,0 +1,149 @@
package com.panzhihua.service_community.api;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
import com.panzhihua.service_community.service.VolunteerIntegralMerchantService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@Slf4j
@RestController
@RequestMapping("/VolunteerIntegralMerchant")
public class VolunteerIntegralMerchantApi  extends BaseController
{
    @Resource
    private VolunteerIntegralMerchantService merchantService;
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    @GetMapping("/queryById")
    public R VolunteerIntegralMerchantQueryById(@RequestParam("id") String id)
    {
        return R.ok(merchantService.queryById(id));
    }
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/queryList")
    public R VolunteerIntegralMerchantQueryList(@RequestParam("pageNum") int pageNum,
                       @RequestParam("pageSize")  int pageSize,
                       @RequestParam("name")  String name,
                       @RequestParam("state")  String state)
    {
        Page page=new Page<VolunteerIntegralMerchant>(pageNum,pageSize);
        return R.ok(merchantService.queryList(page,name,state));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/insertVolunteer")
    public R VolunteerIntegralMerchantInsertVolunteer(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        if(vimVO==null)
        {
            return R.fail("参数不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getCommunityId()))
        {
            vimVO.setCommunityId(getCommunityId()+"");
        }
        if(StringUtils.isEmpty(vimVO.getName()))
        {
            return R.fail("商品名称不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getIntegral()))
        {
            return R.fail("商品所需积分不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }
        //默认下架状态
        vimVO.setState("0");
        int num= merchantService.insertVolunteer(vimVO);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @PostMapping("/updateById")
    public R  VolunteerIntegralMerchantUpdateById(@RequestBody VolunteerIntegralMerchantVO vimVO)
    {
        if(vimVO==null)
        {
            return R.fail("参数不能为空");
        }
        VolunteerIntegralMerchant vim= merchantService.queryById(vimVO.getId());
        if(StringUtils.equals("1",vim.getState()))
        {
            return R.fail("商品必须下架才能编辑");
        }
        if(StringUtils.isEmpty(vimVO.getCommunityId()))
        {
            vimVO.setCommunityId(getCommunityId()+"");
        }
        if(StringUtils.isEmpty(vimVO.getName()))
        {
            return R.fail("商品名称不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getIntegral()))
        {
            return R.fail("商品所需积分不能为空");
        }
        if(StringUtils.isEmpty(vimVO.getCommodityValue()))
        {
            return R.fail("商品价值不能为空");
        }
        int num= merchantService.updateById(vimVO);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
    @DeleteMapping("/deleteById")
    public R  VolunteerIntegralMerchantDeleteById(@RequestParam String id)
    {
        int num= merchantService.deleteById(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("操作失败");
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralRecordApi.java
@@ -5,7 +5,6 @@
import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO;
import com.panzhihua.service_community.service.VolunteerIntegralRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/VolunteerIntegralMerchantDao.java
New file
@@ -0,0 +1,45 @@
package com.panzhihua.service_community.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface VolunteerIntegralMerchantDao extends BaseMapper<VolunteerIntegralMerchant>
{
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    VolunteerIntegralMerchant queryById(@Param("id") String id);
    /**
     * 分页查询
     * @param
     * @return
     */
    IPage<VolunteerIntegralMerchant> queryList(Page page,
                                       @Param("name") String name,
                                       @Param("state") String state);
    /**
     * 新增
     * @param
     * @return
     */
    int insertVolunteer(@Param("vimVO") VolunteerIntegralMerchantVO vimVO);
    int updateById(@Param("vimVO") VolunteerIntegralMerchantVO vimVO);
    int deleteById(@Param("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerActivity.java
@@ -114,7 +114,7 @@
     * 活动封面
     */
    @ApiModelProperty(value = "活动封面")
    private String activitCoverUrl;
    private String activityCoverUrl;
    /**
     * 活动内容
     */
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerIntegralMerchant.java
New file
@@ -0,0 +1,84 @@
package com.panzhihua.service_community.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("爱心积分商城")
public class VolunteerIntegralMerchant implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    /**
     * 主键
     */
    @ApiModelProperty(value = "主键")
    private String id;
    /**
     * 活动名称
     */
    @ApiModelProperty(value = "活动名称")
    private String name;
    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date creationTime;
    /**
     * 更新时间
     */
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    /**
     * 社区id
     */
    @ApiModelProperty(value = "社区id")
    private String communityId;
    /**
     * 商品价值
     */
    @ApiModelProperty(value = "商品价值")
    private String commodityValue;
    /**
     * 所需积分
     */
    @ApiModelProperty(value = "所需积分")
    private String integral;
    /**
     * 上架状态 0下架  1上架
     */
    @ApiModelProperty(value = "上架状态 0下架  1上架")
    private String state;
    /**
     * 商品封面url
     */
    @ApiModelProperty(value = "商品封面url")
    private String coverUrl;
    /**
     * 商品详情
     */
    @ApiModelProperty(value = "商品详情")
    private String content;
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerIntegralMerchantService.java
New file
@@ -0,0 +1,35 @@
package com.panzhihua.service_community.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
public interface VolunteerIntegralMerchantService
{
    /**
     * 获取单个详情
     * @param id
     * @return
     */
    VolunteerIntegralMerchant queryById(String id);
    /**
     * 分页查询
     * @param
     * @return
     */
    IPage<VolunteerIntegralMerchant> queryList(Page page, String name, String state);
    /**
     * 新增
     * @param
     * @return
     */
    int insertVolunteer(VolunteerIntegralMerchantVO vimVO);
    int updateById(VolunteerIntegralMerchantVO vimVO);
    int deleteById(String id);
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/VolunteerIntegralMerchantServiceImpl.java
New file
@@ -0,0 +1,49 @@
package com.panzhihua.service_community.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.VolunteerIntegralMerchantVO;
import com.panzhihua.common.model.vos.community.VolunteerIntegralRecordVO;
import com.panzhihua.service_community.dao.VolunteerIntegralMerchantDao;
import com.panzhihua.service_community.dao.VolunteerIntegralRecordDao;
import com.panzhihua.service_community.entity.VolunteerIntegralMerchant;
import com.panzhihua.service_community.entity.VolunteerIntegralRecord;
import com.panzhihua.service_community.service.VolunteerIntegralMerchantService;
import com.panzhihua.service_community.service.VolunteerIntegralRecordService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class VolunteerIntegralMerchantServiceImpl extends ServiceImpl<VolunteerIntegralMerchantDao,
        VolunteerIntegralMerchant> implements VolunteerIntegralMerchantService
{
    @Override
    public VolunteerIntegralMerchant queryById(String id) {
        return baseMapper.queryById(id);
    }
    @Override
    public IPage<VolunteerIntegralMerchant> queryList(Page page, String name, String state) {
        return baseMapper.queryList(page,name,state);
    }
    @Override
    public int insertVolunteer(VolunteerIntegralMerchantVO vimVO) {
        return baseMapper.insertVolunteer(vimVO);
    }
    @Override
    public int updateById(VolunteerIntegralMerchantVO vimVO) {
        return baseMapper.updateById(vimVO);
    }
    @Override
    public int deleteById(String id) {
        return baseMapper.deleteById(id);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerActivityMapper.xml
@@ -21,7 +21,7 @@
        <result property="isCancelled" column="is_cancelled" />
        <result property="contactName" column="contact_name" />
        <result property="contactPhone" column="contact_phone" />
        <result property="activitCoverUrl" column="activity_cover_url" />
        <result property="activityCoverUrl" column="activity_cover_url" />
        <result property="activityContent" column="activity_content" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
@@ -37,7 +37,7 @@
            name,
            ac_type,
            address,
            (select count(id) from volunteer_activities_people_involved where activity_id=id) volunteerNum,
            (select count(id) from volunteer_activities_people_involved where activity_id=volunteer_activity.id) volunteerNum,
            ac_state,
            award_state,
            issue_time,
@@ -168,7 +168,7 @@
            <if test="volunteerActivityVO.contactPhone != null">
                contact_phone,
            </if>
            <if test="volunteerActivityVO.activitCoverUrl != null">
            <if test="volunteerActivityVO.activityCoverUrl != null">
                activity_cover_url,
            </if>
            <if test="volunteerActivityVO.activityContent != null">
@@ -238,8 +238,8 @@
            <if test="volunteerActivityVO.contactPhone != null">
                #{volunteerActivityVO.contactPhone},
            </if>
            <if test="volunteerActivityVO.activitCoverUrl != null">
                #{volunteerActivityVO.activitCoverUrl},
            <if test="volunteerActivityVO.activityCoverUrl != null">
                #{volunteerActivityVO.activityCoverUrl},
            </if>
            <if test="volunteerActivityVO.activityContent != null">
                #{volunteerActivityVO.activityContent},
@@ -311,8 +311,8 @@
            <if test="volunteerActivityVO.contactPhone != null">
                contact_phone=#{volunteerActivityVO.contactPhone},
            </if>
            <if test="volunteerActivityVO.activitCoverUrl != null">
                activity_cover_url=#{volunteerActivityVO.activitCoverUrl},
            <if test="volunteerActivityVO.activityCoverUrl != null">
                activity_cover_url=#{volunteerActivityVO.activityCoverUrl},
            </if>
            <if test="volunteerActivityVO.activityContent != null">
                activity_content=#{volunteerActivityVO.activityContent},
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/VolunteerIntegralMerchantMapper.xml
New file
@@ -0,0 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.panzhihua.service_community.dao.VolunteerIntegralMerchantDao">
    <resultMap type="com.panzhihua.service_community.entity.VolunteerIntegralMerchant" id="VolunteerIntegralMerchantMap">
        <result property="id" column="id" />
        <result property="name" column="name" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
        <result property="commodityValue" column="commodity_value" />
        <result property="integral" column="integral" />
        <result property="state" column="state" />
        <result property="coverUrl" column="cover_url" />
        <result property="content" column="content" />
        <result property="communityId" column="community_id" />
    </resultMap>
    <sql id="sql_base">
        id,
        name,
        creation_time,
        update_time,
        commodity_value,
        integral,
        state,
        cover_url,
        content,
        community_id
    </sql>
    <!--查询单个-->
    <select id="queryById" resultMap="VolunteerIntegralMerchantMap">
        select <include refid="sql_base"/>
        from volunteer_integral_merchant
        where id= #{id}
    </select>
    <!-- 分页查询 -->
    <select id="queryList" resultMap="VolunteerIntegralMerchantMap">
        select <include refid="sql_base"/>
        from volunteer_integral_merchant
        <where>
            1=1
            <if test="name!=null">
                and (`name` like concat('%',#{name},'%')
            </if>
            <if  test="acState!=null">
                and ac_state =#{acState}
            </if>
            <if  test="acType!=null">
                and ac_type =#{acType}
            </if>
            <if  test="actityBeginTime!=null">
                and actity_begin_time >= #{actityBeginTime}
            </if>
            <if  test="actityEndTime!=null">
                and actity_end_time <![CDATA[ <= ]]> #{actityEndTime}
            </if>
        </where>
        order by creation_time desc
    </select>
    <insert id="insertVolunteer">
        insert into volunteer_integral_merchant
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="vimVO.id != null">
                id,
            </if>
            <if test="vimVO.name != null">
                name,
            </if>
            <if test="vimVO.communityId != null">
                community_id,
            </if>
            <if test="vimVO.commodityValue != null">
                commodity_value,
            </if>
            <if test="vimVO.integral != null">
                integral,
            </if>
            <if test="vimVO.state != null">
                state,
            </if>
            <if test="vimVO.coverUrl != null">
                cover_url,
            </if>
            <if test="vimVO.content != null">
                content,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="vimVO.id != null">
                #{vimVO.id},
            </if>
            <if test="vimVO.name != null">
                #{vimVO.name},
            </if>
            <if test="vimVO.communityId != null">
                #{vimVO.communityId},
            </if>
            <if test="vimVO.commodityValue != null">
                #{vimVO.commodityValue},
            </if>
            <if test="vimVO.integral != null">
                #{vimVO.integral},
            </if>
            <if test="vimVO.state != null">
                #{vimVO.state},
            </if>
            <if test="vimVO.coverUrl != null">
                #{vimVO.coverUrl},
            </if>
            <if test="vimVO.content != null">
                #{vimVO.content},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="updateById">
        update volunteer_integral_merchant
        <set>
            <if test="vimVO.id != null">
                id=#{vimVO.id},
            </if>
            <if test="vimVO.name != null">
                name=#{vimVO.name},
            </if>
            <if test="vimVO.communityId != null">
                community_id=#{vimVO.communityId},
            </if>
            <if test="vimVO.commodityValue != null">
                commodity_value=#{vimVO.commodityValue},
            </if>
            <if test="vimVO.integral != null">
                integral=#{vimVO.integral},
            </if>
            <if test="vimVO.state != null">
                state=#{vimVO.state},
            </if>
            <if test="vimVO.coverUrl != null">
                cover_url=#{vimVO.coverUrl},
            </if>
            <if test="vimVO.content != null">
                content=#{vimVO.content},
            </if>
            update_time=sysdate()
        </set>
        where id = #{vimVO.id}
    </update>
    <delete id="deleteById" parameterType="String">
        delete from volunteer_integral_merchant where id=#{id}
    </delete>
</mapper>