商城 商品 兑换地址模块2

lidongdong

2023-11-17 f9d2eaaa5939b05826a90803fc320eafd5408b03

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java

@@ -5,6 +5,8 @@
import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.model.vos.user.SysTemplateConfigVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
@@ -232,14 +234,14 @@
                                      @RequestParam("pageSize") int pageSize)
    {
        return newStriveForFeign.getNewFightCommunityList(pageNum,pageSize,
                getCommunityId()+"",getUserId()+"");
                getCommunityId()+"",null);
    }

    @ApiOperation(value = "社区共建项目删除", response = NewFightCommunityConstructionDTO.class)
    @ApiOperation(value = "社区共建项目详情", response = NewFightCommunityConstructionDTO.class)
    @GetMapping("/getNewFightCommunityDetails")
    public R getNewFightCommunityDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getNewFightCommunityDetails(id);
        return newStriveForFeign.getNewFightCommunityDetails(id,getUserId()+"");
    }

    @ApiOperation(value = "社区共建项目添加")
@@ -304,11 +306,7 @@
    @PostMapping("/editProjectPlanAccomplish")
    public R editProjectPlanAccomplish(@RequestParam("id") String id)
    {
        NewFightProjectPlanDTO item =new NewFightProjectPlanDTO();
        item.setId(id);
        item.setAffirmTime(new Date());
        item.setAccomplish("1");
        return newStriveForFeign.editProjectPlanData(item);
        return newStriveForFeign.editProjectPlanAccomplish(id);
    }


@@ -358,9 +356,11 @@

    @ApiOperation(value = "项目参与人员取消报名")
    @DeleteMapping("/expurgateJoinData")
    public R expurgateJoinData(@RequestParam("id") String id)
    public R expurgateJoinData(@RequestParam(value = "id", required = false) String id,
                               @RequestParam(value = "projectId", required = false) String projectId,
                               @RequestParam(value = "userId", required = false) String userId)
    {
        return newStriveForFeign.expurgateJoinData(id);
        return newStriveForFeign.expurgateJoinData(id,projectId,userId);
    }


@@ -410,7 +410,7 @@

    /*******************************************************************************************************************
     *
     *
     *                                  微心愿app
     *
     * ****************************************************************************************************************/

@@ -527,7 +527,82 @@
    }


    /************************************************************************************************************
     *
     *                       资源共享
     *
     *************************************************************************************************************/

    @ApiOperation(value = "资源共享列表", response = NewFightResourceSharingDTO.class)
    @GetMapping("/getResourceSharingList")
    public R getResourceSharingList(@RequestParam("pageNum") int pageNum,
                                    @RequestParam("pageSize") int pageSize,
                                    @RequestParam(value = "communityId", required = false)String communityId)
    {
        return newStriveForFeign.getResourceSharingList(pageNum,pageSize,communityId,null);
    }

    @ApiOperation(value = "资源共享详情", response = NewFightResourceSharingDTO.class)
    @GetMapping("/getResourceSharingDetails")
    public R getResourceSharingDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getResourceSharingDetails(id);
    }


    /*******************************************************************************************************
     *
     *                   积分商城
     *
     *******************************************************************************************************/
    @ApiOperation(value = "积分商品列表", response = NewFightShoppingVO.class)
    @GetMapping("/getFightShoppingList")
    public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
                                  @RequestParam("pageNum") int pageSize,
                                  @RequestParam(value = "goodName", required = false)String goodName,
                                  @RequestParam(value = "goodType", required = false)String goodType,
                                  @RequestParam(value = "id", required = false)String id)
    {
        return newStriveForFeign.getFightShoppingList(pageNum,pageSize,getCommunityId()+"",
                goodName,goodType,id);
    }


    @ApiOperation(value = "积分商品详情", response = NewFightShoppingVO.class)
    @GetMapping("/getFightShoppingDetails")
    public R getFightShoppingDetails(@RequestParam("id") String id)
    {
        return newStriveForFeign.getFightShoppingDetails(id);
    }


    /*******************************************************************************************************
     *
     *                                           商家模块
     *
     * ********************************************************************************************************/

    @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "keyword", required = false)String keyword)
    {
        return newStriveForFeign.pageMerchant(pageNum,pageSize,getCommunityId()+"","0",
                keyword,"1");
    }

    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.selectMerchantById(merchantId);
    }

}