Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-17 f721ee13dc5f95f607bb25b09f73cae6a7123ed9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1,10 +1,13 @@
package com.panzhihua.common.service.community;

import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
@@ -12,6 +15,8 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
@@ -1794,6 +1799,67 @@
    @GetMapping("/shop/getStoreInfo")
    R getStoreInfo(@RequestParam("id")Long id);


    /**
     * 商品列表-分页查询
     * @param pageComShopGoodsDTO 添加数据
     */
    @PostMapping("/shop/pageShopGoods")
    R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO);

    /**
     * 新增商品
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shop/saveShopGoods")
    R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO);

    /**
     * 编辑商品
     * @param id
     * @param addShopGoodsVO
     * @return
     */
    @PostMapping("/shop/editShopGoods/{id}")
    R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO);

    /**
     * 删除商品
     * @param id
     * @return
     */
    @PostMapping("/shop/deleteShopGoods")
    R deleteShopGoods(@RequestBody Long[] id);
    /**
     * 修改商品状态
     * @param id
     * @return
     */
    @PostMapping("/shop/changeShopGoodsStatus")
    R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
    /**
     * 结果
     * @param shopOperlog 商城后台操作日志
     */
    @PostMapping("/shop/addShopOperLog")
    R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog);

    /**
     * 分页查询 商家后台操作日志
     * @param pageDTO 分页数据
     * @return 分页日志
     */
    @PostMapping("/shop/pageShopOperLog")
    R pageShopOperLog(@RequestBody PageDTO pageDTO);

    /**
     * 分页查询 商家后台操作日志
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 分页日志
     */
    @PostMapping("/shop/order/page")
    R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
    /**
     * 分页查询店铺列表
     * @param comShopStoreDTO   请求参数