lidongdong
2023-10-22 4cf619d61f35ae37f6c9e3a7083c2fa3176758aa
新增体验活动接口
6个文件已添加
9个文件已修改
875 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinghuiMerchantEvaluateApi.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiExperienceActivityApi.java 89 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiCoinTableApi.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiApplyExperienceDao.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiApplyExperience.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiExperienceActivity.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiApplyExperienceService.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiApplyExperienceServiceImpl.java 178 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiCoinGeneralTableServiceImpl.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiApplyExperienceMapper.xml 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiExperienceActivityMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -656,5 +656,52 @@
    /*******************************************************************************************************
     *
     *                           金汇报名体验
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇报名体验列表", response = JinhuiApplyExperienceVO.class)
    @GetMapping("/applyExperienceGetList")
    public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "isFeedback", required = false) String isFeedback,
                                    @RequestParam(value = "activityId", required = false) String activityId)
    {
        return jinhuiCommunityService.applyExperienceGetList(pageNum,pageSize,getUserId()+"",isFeedback,activityId);
    }
    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇报名体验详情", response = JinhuiApplyExperienceVO.class)
    @GetMapping("/applyExperienceGetDetails")
    public R applyExperienceGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyExperienceGetDetails(id,null,null);
    }
    /**
     * 新增
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇报名体验新增")
    @PostMapping("/applyExperienceAddData")
    public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item)
    {
        item.setUserId(getUserId()+"");
        return jinhuiCommunityService.applyExperienceAddData(item);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/jinhui/JinhuiApplyExperienceVO.java
New file
@@ -0,0 +1,53 @@
package com.panzhihua.common.model.vos.jinhui;
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 JinhuiApplyExperienceVO implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "参加人id")
    private String userId;
    @ApiModelProperty(value = "体验内容")
    private String experienceContent;
    @ApiModelProperty(value = "活动id")
    private String activityId;
    @ApiModelProperty(value = "体验提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date uploadingTime;
    @ApiModelProperty(value = "是否反馈(0没有  1有)")
    private String isFeedback;
    @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;
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -742,6 +742,14 @@
     **********************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
//    R getList(int pageNum, int pageSize,
//              String goodName, String goodType, String id);
    /**
     * 单个详情
     * @param id
     * @return
@@ -823,4 +831,62 @@
    /*******************************************************************************************************
     *
     *                           金汇报名体验
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @GetMapping("/applyExperienceGetList")
    public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "userId", required = false) String userId,
                                    @RequestParam(value = "isFeedback", required = false) String isFeedback,
                                    @RequestParam(value = "activityId", required = false) String activityId);
    /**
     * 详情
     * @param id
     * @return
     */
    @GetMapping("/applyExperienceGetDetails")
    public R applyExperienceGetDetails(@RequestParam(value = "id", required = false) String id,
                                       @RequestParam(value = "userId", required = false) String userId,
                                       @RequestParam(value = "activityId", required = false) String activityId);
    /**
     * 新增
     *
     * @param
     * @return
     */
    @PostMapping("/applyExperienceAddData")
    public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    @PostMapping("/applyExperienceEditData")
    public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    @DeleteMapping("/applyExperienceExpurgateData")
    public R applyExperienceExpurgateData(@RequestParam("id") String id);
}
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -897,6 +897,70 @@
        return jinhuiCommunityService.expurgateDataCategories(id);
    }
    /*************************************************************************************************************
     *
     *                   金汇体验活动
     *
     ***************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
//    R getList(int pageNum, int pageSize,
//              String goodName, String goodType, String id);
    /**
     * 单个详情
     * @param id
     * @return
     */
    @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetDetails")
    public R experienceGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.experienceGetDetails(id);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "体验活动新增")
    @PostMapping("/experienceAddData")
    public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item)
    {
        return jinhuiCommunityService.experienceAddData(item);
    }
    /**
     * 编辑
     * @param item
     * @return
     */
    @ApiOperation(value = "体验活动编辑")
    @PostMapping("/experienceEditData")
    public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item)
    {
        return jinhuiCommunityService.experienceEditData(item);
    }
    /**
     * 删除
     * @param id
     * @return
     */
    @ApiOperation(value = "体验活动删除")
    @GetMapping("/experienceExpurgateData")
    public R experienceExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.experienceExpurgateData(id);
    }
    /******************************************************************************************************
     *
     *                    金汇文章
@@ -991,4 +1055,10 @@
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinghuiMerchantEvaluateApi.java
@@ -3,10 +3,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinghuiMerchantEvaluateVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.service_jinhui_community.service.JinghuiMerchantEvaluateService;
import com.panzhihua.service_jinhui_community.service.JinhuiCoinGeneralTableService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiExperienceActivityApi.java
@@ -2,7 +2,9 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiApplyExperienceVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiExperienceActivityVO;
import com.panzhihua.service_jinhui_community.service.JinhuiApplyExperienceService;
import com.panzhihua.service_jinhui_community.service.JinhuiExperienceActivityService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -15,51 +17,114 @@
@Slf4j
@RestController
@RequestMapping("/JinhuiExperience")
public class JinhuiExperienceActivityApi
{
public class JinhuiExperienceActivityApi {
    @Resource
    private JinhuiExperienceActivityService activityService;
    @Resource
    private JinhuiApplyExperienceService applyExperienceService;
    /**
     * 分页查询
     *
     * @param
     * @return
     */
//    R getList(int pageNum, int pageSize,
//              String goodName, String goodType, String id);
    @GetMapping("/experienceGetDetails")
    public R experienceGetDetails(@RequestParam("id") String id)
    {
    public R experienceGetDetails(@RequestParam("id") String id) {
        return R.ok(activityService.getDetails(id));
    }
    /**
     * 新增
     *
     * @param
     * @return
     */
    @PostMapping("/experienceAddData")
    public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item)
    {
    public R experienceAddData(@RequestBody JinhuiExperienceActivityVO item) {
        return activityService.addData(item);
    }
    /**
     * 详情
     *
     * @param item
     * @return
     */
    @PostMapping("/experienceEditData")
    public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item)
    {
    public R experienceEditData(@RequestBody JinhuiExperienceActivityVO item) {
        return activityService.editData(item);
    }
    /**
     * 删除
     *
     * @param id
     * @return
     */
    @GetMapping("/experienceExpurgateData")
    public R experienceExpurgateData(@RequestParam("id") String id)
    {
    public R experienceExpurgateData(@RequestParam("id") String id) {
        return activityService.expurgateData(id);
    }
    /*******************************************************************************************************
     *
     *                           金汇报名体验
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @GetMapping("/applyExperienceGetList")
    public R applyExperienceGetList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "userId", required = false) String userId,
                                    @RequestParam(value = "isFeedback", required = false) String isFeedback,
                                    @RequestParam(value = "activityId", required = false) String activityId)
    {
        return applyExperienceService.getList(pageNum, pageSize, userId, activityId,isFeedback);
    }
    @GetMapping("/applyExperienceGetDetails")
    public R applyExperienceGetDetails(@RequestParam(value = "id", required = false) String id,
                                       @RequestParam(value = "userId", required = false) String userId,
                                       @RequestParam(value = "activityId", required = false) String activityId) {
        return R.ok(applyExperienceService.getDetails(id,userId,activityId));
    }
    /**
     * 新增
     *
     * @param
     * @return
     */
    @PostMapping("/applyExperienceAddData")
    public R applyExperienceAddData(@RequestBody JinhuiApplyExperienceVO item)
    {
        return applyExperienceService.addData(item);
    }
    @PostMapping("/applyExperienceEditData")
    public R applyExperienceEditData(@RequestBody JinhuiApplyExperienceVO item)
    {
        return applyExperienceService.editData(item);
    }
    @DeleteMapping("/applyExperienceExpurgateData")
    public R applyExperienceExpurgateData(@RequestParam("id") String id)
    {
        return applyExperienceService.expurgateData(id);
    }
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/jinhuiCoinTableApi.java
@@ -2,9 +2,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.service_jinhui_community.service.JinhuiCoinGeneralTableService;
import com.panzhihua.service_jinhui_community.service.JinhuiGoldCoinRecordService;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiApplyExperienceDao.java
New file
@@ -0,0 +1,63 @@
package com.panzhihua.service_jinhui_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.jinhui.JinhuiApplyExperienceVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiShoppingVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiApplyExperience;
import com.panzhihua.service_jinhui_community.entity.JinhuiShopping;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface JinhuiApplyExperienceDao extends BaseMapper<JinhuiApplyExperience>
{
    /**
     * 列表
     * @param
     * @return
     */
    IPage<JinhuiApplyExperience> getList(Page page,
                                         @Param("userId") String userId,
                                         @Param("activityId") String activityId,
                                         @Param("isFeedback") String isFeedback);
    /**
     * 详情
     * @param id
     * @return
     */
    JinhuiApplyExperience getDetails(@Param("id") String id,
                                     @Param("userId") String userId,
                                     @Param("activityId") String activityId);
    /**
     * 新增
     * @param
     * @return
     */
    int addData(@Param("item") JinhuiApplyExperienceVO item);
    /**
     * 编辑
     * @param item
     * @return
     */
    int editData(@Param("item") JinhuiApplyExperienceVO item);
    /**
     * 删除
     * @param id
     * @return
     */
    int expurgateData(@Param("id") String id);
    int getNum(@Param("userId") String userId,
               @Param("isFeedback") String isFeedback,
               @Param("activityId") String activityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiApplyExperience.java
New file
@@ -0,0 +1,53 @@
package com.panzhihua.service_jinhui_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 JinhuiApplyExperience implements Serializable {
    private static final long serialVersionUID = -70884515430727555L;
    @ApiModelProperty(value = "主键")
    private String id;
    @ApiModelProperty(value = "参加人id")
    private String userId;
    @ApiModelProperty(value = "体验内容")
    private String experienceContent;
    @ApiModelProperty(value = "活动id")
    private String activityId;
    @ApiModelProperty(value = "是否反馈(0没有  1有)")
    private String isFeedback;
    @ApiModelProperty(value = "体验提交时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date uploadingTime;
    @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;
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/entity/JinhuiExperienceActivity.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_jinhui_community.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -35,16 +36,16 @@
    private String lon;
    @ApiModelProperty(value = "报名开始时间")
    private String applyStartTime;
    private Date applyStartTime;
    @ApiModelProperty(value = "报名结束时间")
    private String applyEndTime;
    private Date applyEndTime;
    @ApiModelProperty(value = "活动开始时间")
    private String activityStartTime;
    private Date activityStartTime;
    @ApiModelProperty(value = "活动结束时间")
    private String activityEndTime;
    private Date activityEndTime;
    @ApiModelProperty(value = "参加人数 (不限传-1)")
    private String peopleNumber;
@@ -61,6 +62,10 @@
    @ApiModelProperty(value = "封面")
    private String coverImgUrl;
    @TableField(exist = false)
    @ApiModelProperty(value = "参加人数")
    private String number;
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiApplyExperienceService.java
New file
@@ -0,0 +1,39 @@
package com.panzhihua.service_jinhui_community.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.jinhui.JinhuiApplyExperienceVO;
import com.panzhihua.service_jinhui_community.entity.JinhuiApplyExperience;
public interface JinhuiApplyExperienceService extends IService<JinhuiApplyExperience>
{
    /**
     * 分页查询
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize, String userId,String activityId,String isFeedback);
    JinhuiApplyExperience getDetails(String id,String userId,String activityId);
    /**
     * 新增
     * @param
     * @return
     */
    R addData(JinhuiApplyExperienceVO item);
    R editData(JinhuiApplyExperienceVO item);
    R expurgateData(String id);
    int getNum(String userId, String isFeedback, String activityId);
    /**
     * 填写反馈接口
     * @return
     */
    R filIn(String userId,String activityId,String content);
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiApplyExperienceServiceImpl.java
New file
@@ -0,0 +1,178 @@
package com.panzhihua.service_jinhui_community.service.impl;
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.jinhui.JinhuiApplyExperienceVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiCoinGeneralTableVO;
import com.panzhihua.common.model.vos.jinhui.JinhuiGoldCoinRecordVO;
import com.panzhihua.service_jinhui_community.dao.JinhuiApplyExperienceDao;
import com.panzhihua.service_jinhui_community.entity.JinhuiApplyExperience;
import com.panzhihua.service_jinhui_community.entity.JinhuiCoinGeneralTable;
import com.panzhihua.service_jinhui_community.entity.JinhuiExperienceActivity;
import com.panzhihua.service_jinhui_community.service.JinhuiApplyExperienceService;
import com.panzhihua.service_jinhui_community.service.JinhuiCoinGeneralTableService;
import com.panzhihua.service_jinhui_community.service.JinhuiExperienceActivityService;
import com.panzhihua.service_jinhui_community.service.JinhuiGoldCoinRecordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Slf4j
@Service
public class JinhuiApplyExperienceServiceImpl extends ServiceImpl<JinhuiApplyExperienceDao,
        JinhuiApplyExperience> implements JinhuiApplyExperienceService
{
    @Resource
    private JinhuiExperienceActivityService activityService;
    @Resource
    private JinhuiGoldCoinRecordService recordService;
    @Resource
    private JinhuiCoinGeneralTableService tableService;
    @Override
    public R getList(int pageNum,int pageSize,String userId,String activityId,String isFeedback)
    {
        Page page = new Page<JinhuiApplyExperience>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,userId,activityId,isFeedback));
    }
    @Override
    public JinhuiApplyExperience getDetails(String id, String userId, String activityId) {
        return baseMapper.getDetails(id,userId,activityId);
    }
    @Override
    public R addData(JinhuiApplyExperienceVO item)
    {
        if(StringUtils.isEmpty(item.getActivityId()))
        {
            return R.fail("活动id不能为空");
        }
        JinhuiApplyExperience applyExperience=baseMapper.getDetails(null,item.getUserId(),item.getActivityId());
        if(applyExperience!=null && !StringUtils.isEmpty(applyExperience.getId()) )
        {
            return R.fail("该活动已参加");
        }
        //获取活动信息
        JinhuiExperienceActivity activity=activityService.getDetails(item.getActivityId());
        if (!StringUtils.equals("-1",activity.getPeopleNumber()))
        {
            //总数
            int allNum=Integer.valueOf(activity.getPeopleNumber());
            //报名人数
            int num=getNum(null,null,item.getActivityId());
            if(num>=allNum)
            {
                return R.fail("报名人数已满");
            }
        }
        //当前时间
        long newTime=System.currentTimeMillis();
        //报名开始时间
        long applyStartTime=activity.getApplyStartTime().getTime();
        //报名结束时间
        long applyEndTime=activity.getApplyEndTime().getTime();
        if(applyStartTime<newTime && newTime<applyEndTime)
        {
            int num= baseMapper.addData(item);
            if(num>0)
            {
                return R.ok();
            }
            return R.fail("添加失败");
        }
        else
        {
            return R.fail("报名未开始或报名已结束");
        }
    }
    @Override
    public R editData(JinhuiApplyExperienceVO item) {
        int num= baseMapper.editData(item);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public R expurgateData(String id) {
        int num= baseMapper.expurgateData(id);
        if(num>0)
        {
            return R.ok();
        }
        return R.fail("添加失败");
    }
    @Override
    public int getNum(String userId, String isFeedback, String activityId) {
        return baseMapper.getNum(userId,isFeedback,activityId);
    }
    @Override
    public R filIn(String userId, String activityId, String content)
    {
        if (StringUtils.isEmpty(activityId))
        {
            return R.fail("活动id不能为空");
        }
        if(StringUtils.isEmpty(content))
        {
            return R.fail("填写内容不能为空");
        }
        //获取报名体验详情
        JinhuiApplyExperience applyExperience=baseMapper.getDetails(null,userId,activityId);
        JinhuiApplyExperienceVO applyExperienceVO=new JinhuiApplyExperienceVO();
        applyExperienceVO.setId(applyExperience.getId());
        applyExperienceVO.setExperienceContent(content);
        applyExperienceVO.setIsFeedback("1");
        baseMapper.editData(applyExperienceVO);
        //获取活动信息
        JinhuiExperienceActivity activity=activityService.getDetails(activityId);
        int award=0;
        if(!StringUtils.isEmpty(activity.getAward()))
        {
            award=Integer.valueOf(activity.getAward());
        }
        if(award>0)
        {
            //增加积分明细
            JinhuiGoldCoinRecordVO recordVO=new JinhuiGoldCoinRecordVO();
            recordVO.setGoldCoin(activity.getAward());
            recordVO.setUserId(userId);
            recordVO.setTitle("参加体验活动奖励");
            recordVO.setType("4");
            recordService.addData(recordVO);
            //修改用户积分
            JinhuiCoinGeneralTableVO table=new JinhuiCoinGeneralTableVO();
            table.setUserId(userId);
            table.setGoldCoin(activity.getAward());
            tableService.addData(table);
        }
        return R.ok();
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiCoinGeneralTableServiceImpl.java
@@ -34,10 +34,30 @@
    @Override
    public R addData(JinhuiCoinGeneralTableVO volunteerTypeVO)
    {
        int num= baseMapper.addData(volunteerTypeVO);
        if(num>0)
        JinhuiCoinGeneralTable table=baseMapper.getDetails(volunteerTypeVO.getUserId());
        if(table==null)
        {
            return R.ok();
            int num= baseMapper.addData(volunteerTypeVO);
            if(num>0)
            {
                return R.ok();
            }
        }
        else
        {
            //修改用户总积分
            int volunteer=Integer.valueOf(volunteerTypeVO.getGoldCoin());
            int myVolunteer=Integer.valueOf(table.getGoldCoin());
            myVolunteer=myVolunteer+volunteer;
            JinhuiCoinGeneralTableVO tableVO=new JinhuiCoinGeneralTableVO();
            tableVO.setId(table.getId());
            tableVO.setGoldCoin(myVolunteer+"");
            int num= baseMapper.editData(tableVO);
            if(num>0)
            {
                return R.ok();
            }
        }
        return R.fail("添加失败");
    }
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiApplyExperienceMapper.xml
New file
@@ -0,0 +1,169 @@
<?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_jinhui_community.dao.JinhuiApplyExperienceDao">
    <resultMap type="com.panzhihua.service_jinhui_community.entity.JinhuiApplyExperience" id="itemMap">
        <result property="id" column="id" />
        <result property="userId" column="user_id" />
        <result property="experienceContent" column="experience_content" />
        <result property="activityId" column="activity_id" />
        <result property="uploadingTime" column="uploading_time" />
        <result property="creationTime" column="creation_time" />
        <result property="updateTime" column="update_time" />
        <result property="isFeedback" column="is_feedback" />
    </resultMap>
    <!-- 分页查询 -->
    <select id="getList" resultMap="itemMap">
        select
            id,
            user_id,
            experience_content,
            activity_id,
            uploading_time,
            creation_time,
            is_feedback,
            update_time
        from jinhui_apply_experience
        <where>
            1=1
            <if test="userId !=null and userId !='' ">
                and user_id=#{userId}
            </if>
            <if test="isFeedback !=null and isFeedback !='' ">
                and is_feedback=#{isFeedback}
            </if>
            <if test="activityId !=null and activityId !='' ">
                and activity_id=#{activityId}
            </if>
        </where>
        order by creation_time desc
    </select>
    <select id="getNum" resultType="int">
        select
        count (id)
        from jinhui_apply_experience
        <where>
            1=1
            <if test="userId !=null and userId !='' ">
                and user_id=#{userId}
            </if>
            <if test="isFeedback !=null and isFeedback !='' ">
                and is_feedback=#{isFeedback}
            </if>
            <if test="activityId !=null and activityId !='' ">
                and activity_id=#{activityId}
            </if>
        </where>
    </select>
    <select id="getDetails" resultMap="itemMap">
        select
            id,
            user_id,
            experience_content,
            activity_id,
            uploading_time,
            creation_time,
            is_feedback,
            update_time
        from jinhui_apply_experience
        <where>
            1=1
            <if test="id!=null and id != '' ">
                and id=#{id}
            </if>
            <if test=" userId!=null and userId != '' ">
                and user_id=#{userId}
            </if>
            <if test=" activityId !=null and activityId != '' ">
                and activity_id=#{activityId}
            </if>
        </where>
    </select>
    <insert id="addData">
        insert into jinhui_apply_experience
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                id,
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id,
            </if>
            <if test="item.experienceContent != null and item.experienceContent != '' ">
                experience_content,
            </if>
            <if test="item.activityId != null and item.activityId != '' ">
                activity_id,
            </if>
            <if test="item.uploadingTime != null ">
                uploading_time,
            </if>
            <if test="item.isFeedback != null ">
                is_feedback,
            </if>
            creation_time
        </trim>
        values
        <trim prefix="("  suffix=")" suffixOverrides=",">
            <if test="item.id != null and item.id != '' ">
                #{item.id},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                #{item.userId},
            </if>
            <if test="item.experienceContent != null and item.experienceContent != '' ">
                #{item.experienceContent},
            </if>
            <if test="item.activityId != null and item.activityId != '' ">
                #{item.activityId},
            </if>
            <if test="item.uploadingTime != null ">
                #{item.uploadingTime},
            </if>
            <if test="item.isFeedback != null ">
                #{item.isFeedback},
            </if>
            sysdate()
        </trim>
    </insert>
    <update id="editData">
        update jinhui_apply_experience
        <set>
            <if test="item.id != null and item.id != '' ">
                id=#{item.id},
            </if>
            <if test="item.userId != null and item.userId != '' ">
                user_id=#{item.userId},
            </if>
            <if test="item.experienceContent != null and item.experienceContent != '' ">
                experience_content=#{item.experienceContent},
            </if>
            <if test="item.activityId != null and item.activityId != '' ">
                activity_id=#{item.activityId},
            </if>
            <if test="item.uploadingTime != null ">
                uploading_time=#{item.uploadingTime},
            </if>
            <if test="item.isFeedback != null ">
                is_feedback=#{item.isFeedback},
            </if>
            update_time=sysdate()
        </set>
        where id = #{item.id}
    </update>
    <delete id="expurgateData" parameterType="String">
        delete from jinhui_apply_experience where id=#{id}
    </delete>
</mapper>
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/resources/mapper/JinhuiExperienceActivityMapper.xml
@@ -36,6 +36,8 @@
            people_number,
            phone,
            award,
            (select count(jae.id) from jinhui_apply_experience as jae
            where jae.activity_id=jinhui_experience_activity.id) as number,
            cover_img_url,
            creation_time,
            update_time,
@@ -69,6 +71,8 @@
            activity_start_time,
            activity_end_time,
            people_number,
            (select count(jae.id) from jinhui_apply_experience as jae
             where jae.activity_id=jinhui_experience_activity.id) as number,
            phone,
            award,
            cover_img_url,