商城 商品 兑换地址模块2

lidongdong

2023-11-17 f9d2eaaa5939b05826a90803fc320eafd5408b03

商城  商品  兑换地址模块2

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

@@ -581,11 +581,8 @@
     *             商家模块
     *
     * ********************************************************************************************************/
    /**
     * 分页查询便民服务商家 运营后台
     *
     * @return
     */

    @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
@@ -601,6 +598,7 @@
     * @param merchantId
     * @return
     */
    @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {

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

@@ -269,8 +269,9 @@
     * @param operator
     * @return
     */
    @ApiOperation(value = "商家删除")
    @DeleteMapping("/deleteMerchantById")
    public R deleteMerchantById(@RequestParam("communityId") String merchantId)
    public R deleteMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.deleteMerchantById(merchantId);
    }
@@ -282,8 +283,9 @@
     * @param status
     * @return
     */
    @ApiOperation(value = "商家禁止or启用  status 1 启用  2禁止 ")
    @GetMapping("/editMerchantStatus")
    public R editMerchantStatus(@RequestParam("communityId") String merchantId,
    public R editMerchantStatus(@RequestParam("merchantId") String merchantId,
                                @RequestParam("status") String status)
    {
        return newStriveForFeign.editMerchantStatus(merchantId,status);
@@ -294,6 +296,7 @@
     *
     * @return
     */
    @ApiOperation(value = "商家列表", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/pageMerchant")
    public R pageMerchant(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
@@ -310,18 +313,21 @@
     * @param merchantId
     * @return
     */
    @ApiOperation(value = "商家详情", response = NewFightConvenientMerchantVO.class)
    @GetMapping("/selectMerchantById")
    public R selectMerchantById(@RequestParam("merchantId") String merchantId)
    {
        return newStriveForFeign.selectMerchantById(merchantId);
    }

    @ApiOperation(value = "商家添加")
    @PostMapping("/addMerchantData")
    public R addMerchantData(@RequestBody NewFightConvenientMerchantVO item)
    {
        return newStriveForFeign.addMerchantData(item);
    }

    @ApiOperation(value = "商家编辑")
    @PostMapping("/editMerchantData")
    public R editMerchantData(@RequestBody NewFightConvenientMerchantVO item)
    {