lidongdong
2023-10-22 09d39731cd9bc659e021972f924d35533e5cac72
新增体验活动接口小程序
7个文件已修改
197 ■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiExperienceActivityApi.java 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiExperienceActivityDao.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiExperienceActivityService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiExperienceActivityServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -655,6 +655,43 @@
    /*************************************************************************************************************
     *
     *                   金汇体验活动
     *
     ***************************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetList")
    public R experienceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize")  int pageSize,
                               @RequestParam(value = "activityName", required = false) String activityName,
                               @RequestParam(value = "activityType", required = false) String activityType,
                               @RequestParam(value = "starTime", required = false) Date starTime,
                               @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime);
    }
    /**
     * 单个详情
     * @param id
     * @return
     */
    @ApiOperation(value = "体验活动单个详情", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetDetails")
    public R experienceGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.experienceGetDetails(id);
    }
    /*******************************************************************************************************
     *
@@ -704,4 +741,16 @@
    }
    /**
     * 填写反馈接口
     * @return
     */
    @ApiOperation(value = "金汇报名体验填写反馈接口")
    @GetMapping("/applyExperienceFilIn")
    public R filIn(@RequestParam("activityId") String activityId,
                   @RequestParam("content") String content)
    {
        return jinhuiCommunityService.filIn(getUserId()+"",activityId,content);
    }
}
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java
@@ -12,6 +12,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.Date;
/**
 * 金汇社区
 */
@@ -746,8 +748,19 @@
     * @param
     * @return
     */
//    R getList(int pageNum, int pageSize,
//              String goodName, String goodType, String id);
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @GetMapping("/JinhuiExperience/experienceGetList")
    public R experienceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize")  int pageSize,
                               @RequestParam(value = "activityName", required = false) String activityName,
                               @RequestParam(value = "activityType", required = false) String activityType,
                               @RequestParam(value = "starTime", required = false) Date starTime,
                               @RequestParam(value = "endTime", required = false) Date endTime);
    /**
     * 单个详情
@@ -830,8 +843,6 @@
    /*******************************************************************************************************
     *
     *                           金汇报名体验
@@ -850,11 +861,7 @@
                                    @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,
@@ -869,23 +876,23 @@
    @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);
    /**
     * 填写反馈接口
     * @return
     */
    @GetMapping("/applyExperienceFilIn")
    public R filIn(@RequestParam("userId") String userId,
                   @RequestParam("activityId") String activityId,
                   @RequestParam("content") String content);
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -902,14 +902,23 @@
     *                   金汇体验活动
     *
     ***************************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
//    R getList(int pageNum, int pageSize,
//              String goodName, String goodType, String id);
    @ApiOperation(value = "体验活动列表", response = JinhuiExperienceActivityVO.class)
    @GetMapping("/experienceGetList")
    public R experienceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize")  int pageSize,
                               @RequestParam(value = "activityName", required = false) String activityName,
                               @RequestParam(value = "activityType", required = false) String activityType,
                               @RequestParam(value = "starTime", required = false) Date starTime,
                               @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return jinhuiCommunityService.experienceGetList(pageNum,pageSize,activityName,activityType,starTime,endTime);
    }
    /**
     * 单个详情
@@ -1018,7 +1027,6 @@
    /**
     * 编辑
     * @param item
     * @return
     */
    @ApiOperation(value = "金汇文章上下架")
@@ -1056,6 +1064,46 @@
    /*******************************************************************************************************
     *
     *                           金汇报名体验
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     *
     * @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,null,isFeedback,activityId);
    }
    @ApiOperation(value = "金汇报名体验详情", response = JinhuiApplyExperienceVO.class)
    @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 jinhuiCommunityService.applyExperienceGetDetails(id,null,null);
    }
    @ApiOperation(value = "金汇报名体验删除")
    @DeleteMapping("/applyExperienceExpurgateData")
    public R applyExperienceExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.applyExperienceExpurgateData(id);
    }
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiExperienceActivityApi.java
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.Date;
/**
 * 体验活动
@@ -31,8 +32,16 @@
     * @param
     * @return
     */
//    R getList(int pageNum, int pageSize,
//              String goodName, String goodType, String id);
    @GetMapping("/experienceGetList")
    public R experienceGetList(@RequestParam("pageNum") int pageNum,
                               @RequestParam("pageSize")  int pageSize,
                               @RequestParam(value = "activityName", required = false) String activityName,
                               @RequestParam(value = "activityType", required = false) String activityType,
                               @RequestParam(value = "starTime", required = false) Date starTime,
                               @RequestParam(value = "endTime", required = false) Date endTime)
    {
        return activityService.getList(pageNum,pageSize,activityName,activityType,starTime,endTime);
    }
    @GetMapping("/experienceGetDetails")
    public R experienceGetDetails(@RequestParam("id") String id) {
@@ -126,6 +135,16 @@
    }
    /**
     * 填写反馈接口
     * @return
     */
    @GetMapping("/applyExperienceFilIn")
    public R filIn(@RequestParam("userId") String userId,
                   @RequestParam("activityId") String activityId,
                   @RequestParam("content") String content)
    {
        return applyExperienceService.filIn(userId,activityId,content);
    }
}
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiExperienceActivityDao.java
@@ -8,6 +8,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
@Mapper
public interface JinhuiExperienceActivityDao extends BaseMapper<JinhuiExperienceActivity>
{
@@ -17,9 +19,10 @@
     * @return
     */
    IPage<JinhuiExperienceActivity> getList(Page page,
                                           @Param("goodName") String goodName,
                                           @Param("goodType") String goodType,
                                           @Param("id") String id);
                                           @Param("activityName") String activityName,
                                           @Param("activityType") String activityType,
                                           @Param("starTime") Date starTime,
                                           @Param("endTime") Date endTime);
    /**
     * 详情
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiExperienceActivityService.java
@@ -7,6 +7,8 @@
import com.panzhihua.service_jinhui_community.entity.JinhuiExperienceActivity;
import com.panzhihua.service_jinhui_community.entity.JinhuiShopping;
import java.util.Date;
public interface JinhuiExperienceActivityService extends IService<JinhuiExperienceActivity>
{
    /**
@@ -14,8 +16,7 @@
     * @param
     * @return
     */
    R getList(int pageNum,int pageSize,
              String goodName, String goodType, String id);
    R getList(int pageNum, int pageSize, String activityName, String activityType, Date starTime, Date endTime);
    JinhuiExperienceActivity getDetails(String id);
    /**
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiExperienceActivityServiceImpl.java
@@ -8,7 +8,10 @@
import com.panzhihua.service_jinhui_community.entity.JinhuiExperienceActivity;
import com.panzhihua.service_jinhui_community.service.JinhuiExperienceActivityService;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import java.util.Date;
@Slf4j
@@ -18,12 +21,13 @@
{
    @Override
    public R getList(int pageNum,int pageSize,String goodName, String goodType, String id)
    public R getList(int pageNum,int pageSize,String activityName,String activityType, Date starTime,Date endTime)
    {
        Page page = new Page<JinhuiExperienceActivity>(pageNum,pageSize);
        return R.ok(baseMapper.getList(page,goodName,goodType,id));
        return R.ok(baseMapper.getList(page,activityName,activityType,starTime,endTime));
    }
    @Override
    public JinhuiExperienceActivity getDetails(String id) {
        return baseMapper.getDetails(id);