商城 商品 兑换地址模块

lidongdong

2023-11-17 55552a4e0f1c07ccd29deadbd71ee8cd1598c844

商城  商品  兑换地址模块

 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;
@@ -547,4 +549,62 @@
        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);
    }


    /*******************************************************************************************************
     *
     *             商家模块
     *
     * ********************************************************************************************************/
    /**
     * 分页查询便民服务商家 运营后台
     *
     * @return
     */
    @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
     */
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.selectMerchantById(merchantId);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/NewStriveForFeign.java

@@ -2,6 +2,9 @@

import com.panzhihua.common.model.dtos.partybuilding.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

@@ -263,5 +266,117 @@
    public R expurgateResourceSharingData(@RequestParam("id") String id);


    /************************************************************************************************************
     *
     *                               社区设置兑换时间地点
     *
     ******************************************************************************************************************/
    @GetMapping("/FightConfig/getConfigDetails")
    public R getConfigDetails(@RequestParam("communityId") String communityId);


    @PostMapping("/FightConfig/addConfigData")
    public R addConfigData(@RequestBody NewFightConfigVO item);

    @PostMapping("/FightConfig/editConfigData")
    public R editConfigData(@RequestBody NewFightConfigVO item);


    @DeleteMapping("/FightConfig/expurgateConfigData")
    public R expurgateConfigData(@RequestParam("communityId") String communityId);


    /*******************************************************************************************************
     *
     *                   积分商城
     *
     *******************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/FightShopping/getFightShoppingList")
    public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
                                  @RequestParam("pageNum") int pageSize,
                                  @RequestParam("communityId") String communityId,
                                  @RequestParam(value = "goodName", required = false)String goodName,
                                  @RequestParam(value = "goodType", required = false)String goodType,
                                  @RequestParam(value = "id", required = false)String id);


    @GetMapping("/FightShopping/getFightShoppingDetails")
    public R getFightShoppingDetails(@RequestParam("id") String id);
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/FightShopping/addFightShoppingData")
    public R addFightShoppingData(@RequestBody NewFightShoppingVO item);


    @PostMapping("/FightShopping/editFightShoppingData")
    public R editFightShoppingData(@RequestBody NewFightShoppingVO item);

    @DeleteMapping("/FightShopping/expurgateFightShoppingData")
    public R expurgateFightShoppingData(@RequestParam("id") String id);


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

    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @param operator
     * @return
     */
    @DeleteMapping("/FightConvenient/deleteMerchantById")
    public R deleteMerchantById(@RequestParam("communityId") String merchantId);

    /**
     * 编辑状态
     *
     * @param merchantId
     * @param status
     * @return
     */
    @GetMapping("/FightConvenient/editMerchantStatus")
    public R editMerchantStatus(@RequestParam("communityId") String merchantId,
                                @RequestParam("status") String status);

    /**
     * 分页查询便民服务商家 运营后台
     *
     * @return
     */
    @GetMapping("/FightConvenient/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam("communityId") String communityId,
                          @RequestParam(value = "isDel", required = false) String isDel,
                          @RequestParam(value = "keyword", required = false)String keyword,
                          @RequestParam(value = "status", required = false)String status) ;

    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/FightConvenient/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId);

    @PostMapping("/FightConvenient/addMerchantData")
    public R addMerchantData(@RequestBody NewFightConvenientMerchantVO item) ;

    @PostMapping("/FightConvenient/editMerchantData")
    public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item);


}

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java

@@ -6,6 +6,9 @@
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectPlanDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightResourceSharingDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.common.service.partybuilding.NewStriveForFeign;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -165,4 +168,166 @@
        return newStriveForFeign.expurgateResourceSharingData(id);
    }


    /************************************************************************************************************
     *
     *                               社区设置兑换时间地点
     *
     ******************************************************************************************************************/
    @ApiOperation(value = "兑换时间地点详情", response = NewFightConfigVO.class)
    @GetMapping("/getConfigDetails")
    public R getConfigDetails(@RequestParam("communityId") String communityId)
    {
        return newStriveForFeign.getConfigDetails(communityId);
    }

    @ApiOperation(value = "兑换时间地点添加")
    @PostMapping("/addConfigData")
    public R addConfigData(@RequestBody NewFightConfigVO item)
    {
        return newStriveForFeign.addConfigData(item);
    }

    @ApiOperation(value = "兑换时间地点编辑")
    @PostMapping("/editConfigData")
    public R editConfigData(@RequestBody NewFightConfigVO item)
    {
        return newStriveForFeign.editConfigData(item);
    }

    @ApiOperation(value = "兑换时间地点删除")
    @DeleteMapping("/expurgateConfigData")
    public R expurgateConfigData(@RequestParam("communityId") String communityId)
    {
        return newStriveForFeign.expurgateConfigData(communityId);
    }


    /*******************************************************************************************************
     *
     *                   积分商城
     *
     *******************************************************************************************************/
    @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);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "积分商品添加")
    @PostMapping("/addFightShoppingData")
    public R addFightShoppingData(@RequestBody NewFightShoppingVO item)
    {
        return newStriveForFeign.addFightShoppingData(item);
    }

    @ApiOperation(value = "积分商品编辑")
    @PostMapping("/editFightShoppingData")
    public R editFightShoppingData(@RequestBody NewFightShoppingVO item)
    {
        return newStriveForFeign.editFightShoppingData(item);
    }


    @ApiOperation(value = "积分商品删除")
    @DeleteMapping("/expurgateFightShoppingData")
    public R expurgateFightShoppingData(@RequestParam("id") String id)
    {
        return newStriveForFeign.expurgateFightShoppingData(id);
    }



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

    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @param operator
     * @return
     */
    @DeleteMapping("/deleteMerchantById")
    public R deleteMerchantById(@RequestParam("communityId") String merchantId)
    {
        return newStriveForFeign.deleteMerchantById(merchantId);
    }

    /**
     * 编辑状态
     *
     * @param merchantId
     * @param status
     * @return
     */
    @GetMapping("/editMerchantStatus")
    public R editMerchantStatus(@RequestParam("communityId") String merchantId,
                                @RequestParam("status") String status)
    {
        return newStriveForFeign.editMerchantStatus(merchantId,status);
    }

    /**
     * 分页查询便民服务商家 运营后台
     *
     * @return
     */
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "isDel", required = false) String isDel,
                          @RequestParam(value = "keyword", required = false)String keyword,
                          @RequestParam(value = "status", required = false)String status)
    {
        return newStriveForFeign.pageMerchant(pageNum,pageSize,getCommunityId()+"",isDel,keyword,status);
    }

    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.selectMerchantById(merchantId);
    }

    @PostMapping("/addMerchantData")
    public R addMerchantData(@RequestBody NewFightConvenientMerchantVO item)
    {
        return newStriveForFeign.addMerchantData(item);
    }

    @PostMapping("/editMerchantData")
    public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item)
    {
        return newStriveForFeign.editMerchantData(item);
    }



}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightCommunityConstructionApi.java

@@ -1,6 +1,5 @@
package com.panzhihua.service_dangjian.api;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.partybuilding.NewFightCommunityConstructionDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectEvaluateDTO;
import com.panzhihua.common.model.dtos.partybuilding.NewFightProjectJoinDTO;

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConfigApi.java

New file
@@ -0,0 +1,49 @@
package com.panzhihua.service_dangjian.api;


import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConfigVO;
import com.panzhihua.service_dangjian.service.NewFightConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/FightConfig")
public class NewFightConfigApi
{

    @Resource
    private NewFightConfigService configService;

    @GetMapping("/getConfigDetails")
    public R getConfigDetails(@RequestParam("communityId") String communityId)
    {
        return R.ok(configService.getDetails(communityId));
    }


    @PostMapping("/addConfigData")
    public R addConfigData(@RequestBody NewFightConfigVO item)
    {
        return configService.addData(item);
    }

    @PostMapping("/editConfigData")
    public R editConfigData(@RequestBody NewFightConfigVO item)
    {
        return configService.editData(item);
    }


    @DeleteMapping("/expurgateConfigData")
    public R expurgateConfigData(@RequestParam("communityId") String communityId)
    {
        return configService.expurgateData(communityId);
    }



}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightConvenientMerchantApi.java

New file
@@ -0,0 +1,82 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightConvenientMerchantVO;
import com.panzhihua.service_dangjian.entity.NewFightConvenientMerchant;
import com.panzhihua.service_dangjian.service.NewFightConvenientMerchantService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/FightConvenient")
public class NewFightConvenientMerchantApi {
    @Resource
    private NewFightConvenientMerchantService merchantService;


    /**
     * 删除便民服务商家
     *
     * @param merchantId
     * @param operator
     * @return
     */
    @DeleteMapping("/FightConvenient/deleteMerchantById")
    public R deleteMerchantById(@RequestParam("communityId") String merchantId) {
        return merchantService.deleteMerchantById(merchantId);
    }

    /**
     * 编辑状态
     *
     * @param merchantId
     * @param status
     * @return
     */
    @GetMapping("/editMerchantStatus")
    public R editMerchantStatus(@RequestParam("communityId") String merchantId,
                                @RequestParam("status") String status) {
        return merchantService.editStatus(merchantId, status);
    }

    /**
     * 分页查询便民服务商家 运营后台
     *
     * @return
     */
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam("communityId") String communityId,
                          @RequestParam(value = "isDel", required = false) String isDel,
                          @RequestParam(value = "keyword", required = false)String keyword,
                          @RequestParam(value = "status", required = false)String status) {
        return merchantService.pageMerchant(pageNum, pageSize, isDel, keyword, status, communityId);
    }

    /**
     * 查询商家信息
     *
     * @param merchantId
     * @return
     */
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId) {
        return R.ok(merchantService.selectMerchantById(merchantId));
    }

    @PostMapping("/addMerchantData")
    public R addMerchantData(@RequestBody NewFightConvenientMerchantVO item) {
        return merchantService.addData(item);
    }

    @PostMapping("/editMerchantData")
    public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item)
    {
        return merchantService.editData(item);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/NewFightShoppingApi.java

New file
@@ -0,0 +1,68 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingVO;
import com.panzhihua.service_dangjian.entity.NewFightShopping;
import com.panzhihua.service_dangjian.service.NewFightShoppingService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@Slf4j
@RestController
@RequestMapping("/FightShopping")
public class NewFightShoppingApi
{

    @Resource
    private NewFightShoppingService shoppingService;

    /**
     * 分页查询
     * @param
     * @return
     */
    @GetMapping("/getFightShoppingList")
    public R getFightShoppingList(@RequestParam("pageNum") int pageNum,
              @RequestParam("pageNum") int pageSize,
              @RequestParam("communityId") String communityId,
              @RequestParam(value = "goodName", required = false)String goodName,
              @RequestParam(value = "goodType", required = false)String goodType,
              @RequestParam(value = "id", required = false)String id)
    {
        return shoppingService.getList(pageNum,pageSize,goodName,goodType,id,communityId);
    }


    @GetMapping("/getFightShoppingDetails")
    public R getFightShoppingDetails(@RequestParam("id") String id)
    {
        return R.ok(shoppingService.getDetails(id));
    }
    /**
     * 新增
     * @param
     * @return
     */
    @PostMapping("/addFightShoppingData")
    public R addFightShoppingData(@RequestBody NewFightShoppingVO item)
    {
        return shoppingService.addData(item);
    }


    @PostMapping("/editFightShoppingData")
    public R editFightShoppingData(@RequestBody NewFightShoppingVO item)
    {
        return shoppingService.editData(item);
    }

    @DeleteMapping("/expurgateFightShoppingData")
    public R expurgateFightShoppingData(@RequestParam("id") String id)
    {
        return shoppingService.expurgateData(id);
    }


}