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,9 +1,12 @@
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;
@@ -12,6 +15,7 @@
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;
@@ -1834,4 +1838,185 @@
     */
    @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   请求参数
     * @return  店铺列表
     */
    @PostMapping("/shop/pageShopStore")
    R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO);

    /**
     * 根据id查询店铺详情
     * @param comShopStoreDTO   请求参数
     * @return  店铺详情
     */
    @PostMapping("/shop/shopStoreDetail")
    R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO);

    /**
     * 分页查询商品列表
     * @param comShopGoodsDTO   请求参数
     * @return  商品列表
     */
    @PostMapping("/shop/pageShopGoods")
    R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO);

    /**
     * 根据商品id查询商品信息
     * @param goodsId   商品id
     * @return  商品信息
     */
    @PostMapping("/shop/shopGoodsDetail")
    R shopGoodsDetail(@RequestParam("goodsId") Long goodsId);

    /**
     * 查询用户购物车列表
     * @param userId    用户id
     * @return  购物车列表
     */
    @PostMapping("/shop/shopCartList")
    R shopCartList(@RequestParam("userId") Long userId);

    /**
     * 购物车添加
     * @param comShopCartDTO    请求参数
     * @return  购物车列表
     */
    @PostMapping("/shop/shopAddCart")
    R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO);

    /**
     * 购物车内商品数量修改
     * @param shopEditNubCartDTO    请求参数
     * @return  修改结果
     */
    @PostMapping("/shop/shopEditNubCart")
    R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO);

    /**
     * 删除购物车记录
     * @param Ids   购物车id集合
     * @return  删除结果
     */
    @PostMapping("/shop/shopDelCart")
    R shopDelCart(@RequestBody List<Long> Ids);

    /**
     * 分页查询用户收货地址列表
     * @param comShopAddressDTO    请求参数
     * @return  用户收货地址列表
     */
    @PostMapping("/shop/shopUserAddressList")
    R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);

    /**
     * 用户添加收货地址
     * @param comShopAddressDTO 请求参数
     * @return  添加结果
     */
    @PostMapping("/shop/shopAddUserAddress")
    R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户修改收货地址
     * @param comShopAddressDTO 请求参数
     * @return  修改结果
     */
    @PostMapping("/shop/shopEditUserAddress")
    R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);

    /**
     * 用户删除收货地址
     * @param addressId 收货地址id
     * @return  删除结果
     */
    @PostMapping("/shop/shopDelUserAddress")
    R shopDelUserAddress(@RequestParam("addressId") Long addressId);

    /**
     * 订单预览
     * @param orderPreviewDTO   请求参数
     * @return  订单预览数据
     */
    @PostMapping("/shop/orderPreview")
    R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);

    /**
     * 创建订单
     * @param orderCreateDTO    创建订单请求参数
     * @return  创建结果
     */
    @PostMapping("/shop/orderCreate")
    R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO);

    /**
     * 分页查询用户订单列表
     * @param comOrderListDTO   请求参数
     * @return  查询结果
     */
    @PostMapping("/shop/pageOrderList")
    R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO);

    /**
     * 根据订单id查询订单详情
     * @param orderId   订单id
     * @return  订单详情
     */
    @PostMapping("/shop/orderDetail")
    R orderDetail(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id取消订单
     * @param comShopOrderQueryDTO   请求参数
     * @return  取消结果
     */
    @PostMapping("/shop/orderCancel")
    R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 根据订单id删除订单
     * @param orderId   订单id
     * @return  删除结果
     */
    @PostMapping("/shop/orderDelete")
    R orderDelete(@RequestParam("orderId") Long orderId);

    /**
     * 根据订单id确认收货
     * @param comShopOrderQueryDTO   请求参数
     * @return  确认结果
     */
    @PostMapping("/shop/orderConfirm")
    R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);

    /**
     * 统计用户订单数量
     * @param userId    用户id
     * @return  统计结果
     */
    @PostMapping("/shop/orderStatistics")
    R orderStatistics(@RequestParam("userId") Long userId);
}