Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -1,35 +1,30 @@
package com.panzhihua.service_community.api;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.service_community.model.dos.ComShopSysConfDO;
import com.panzhihua.service_community.service.*;
import com.panzhihua.service_community.service.ComShopGoodsService;
import com.panzhihua.service_community.service.ComShopOperLogService;
import com.panzhihua.service_community.service.ComShopOrderService;
import com.panzhihua.service_community.service.ComShopStoreService;
import lombok.extern.slf4j.Slf4j;
import java.util.List;

import javax.annotation.Resource;

import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.NotNull;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ComShopSysConfVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopSysConfDO;
import com.panzhihua.service_community.service.*;

import lombok.extern.slf4j.Slf4j;

@Slf4j
@RestController
@RequestMapping("/shop")
public class ShopApi{
public class ShopApi {

    @Resource
    private ComShopStoreService comShopStoreService;
@@ -48,7 +43,9 @@

    /**
     * 店铺列表-分页查询
     * @param pageComShopStoreDTO 查询参数
     * 
     * @param pageComShopStoreDTO
     *            查询参数
     * @return PageShopStoreVO
     */
    @PostMapping("/pageShopStore")
@@ -69,8 +66,10 @@

    /**
     * 新增店铺
     * @param storeVO   店铺信息
     * @return  新增结果
     * 
     * @param storeVO
     *            店铺信息
     * @return 新增结果
     */
    @PostMapping("/addStore")
    public R addStore(@RequestBody ShopStoreVO storeVO) {
@@ -81,7 +80,8 @@
     * 编辑店铺、启用、禁用
     *
     * @param storeVO
     * @param id 商铺Id
     * @param id
     *            商铺Id
     * @return
     */
    @PostMapping("/editStore/{id}")
@@ -111,21 +111,23 @@
        return comShopStoreService.getOneInfo(id);
    }


    /**
     * 获取用户商铺详细
     *
     * @param userId 用户ID
     * @param userId
     *            用户ID
     * @return
     */
    @GetMapping("/getUserStoreInfo")
    public R getUserStoreInfo(@RequestParam("userId") Long userId) {
        return comShopStoreService.getUserStoreInfo(userId);
    }

    /**
     * 获取用户商铺详细
     *
     * @param account 用户账号
     * @param account
     *            用户账号
     * @return
     */
    @GetMapping("/getUserStoreInfoByAccount")
@@ -136,7 +138,8 @@
    /**
     * 添加商城后台日志
     *
     * @param shopOperlog 商城日志
     * @param shopOperlog
     *            商城日志
     * @return 添加结果
     */
    @PostMapping("/addShopOperLog")
@@ -144,10 +147,11 @@
        return comShopOperLogService.saveLog(shopOperlog);
    }


    /**
     * 分页查询 商家后台操作日志
     * @param pageDTO 分页数据
     * 
     * @param pageDTO
     *            分页数据
     * @return 分页日志
     */
    @PostMapping("/pageShopOperLog")
@@ -155,30 +159,36 @@
        return comShopOperLogService.pageShopOperLog(pageDTO);
    }


    /**
     * 分页查询 商家订单
     * @param pageComShopOrderSearchDTO 分页数据
     * 
     * @param pageComShopOrderSearchDTO
     *            分页数据
     * @return 分页订单
     */
    @PostMapping("/order/page")
    public R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO) {
        return comShopOrderService.pageShopOrder(pageComShopOrderSearchDTO);
    }

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

    /**
     * 分页查询商品列表
     * @param comShopGoodsDTO   请求参数
     * @return  商品列表
     * 
     * @param comShopGoodsDTO
     *            请求参数
     * @return 商品列表
     */
    @PostMapping("/pageShopGoods")
    public R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO) {
@@ -188,18 +198,22 @@

    /**
     * 根据商品id查询商品详情
     * @param goodsId   商品id
     * @return  商品信息
     * 
     * @param goodsId
     *            商品id
     * @return 商品信息
     */
    @PostMapping("shopGoodsDetail")
    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId){
    public R shopGoodsDetail(@RequestParam("goodsId") Long goodsId) {
        return comShopGoodsService.shopGoodsDetail(goodsId);
    }

    /**
     * 根据用户id查询购物车列表
     * @param userId    用户id
     * @return  购物车列表信息
     * 
     * @param userId
     *            用户id
     * @return 购物车列表信息
     */
    @PostMapping("shopCartList")
    public R shopCartList(@RequestParam("userId") Long userId) {
@@ -208,8 +222,10 @@

    /**
     * 查询用户购物车数量
     * @param userId    用户id
     * @return  用户购物车商品数量
     * 
     * @param userId
     *            用户id
     * @return 用户购物车商品数量
     */
    @PostMapping("shopCartUserTotal")
    public R shopCartUserTotal(@RequestParam("userId") Long userId) {
@@ -218,8 +234,10 @@

    /**
     * 购物车添加
     * @param comShopCartDTO    请求参数
     * @return  添加结果
     * 
     * @param comShopCartDTO
     *            请求参数
     * @return 添加结果
     */
    @PostMapping("shopAddCart")
    public R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO) {
@@ -228,8 +246,10 @@

    /**
     * 购物车内商品数量添加
     * @param shopEditNubCartDTO    请求参数
     * @return  修改结果
     * 
     * @param shopEditNubCartDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("shopEditNubCart")
    public R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO) {
@@ -238,8 +258,10 @@

    /**
     * 删除购物车记录
     * @param Ids   购物车id集合
     * @return  删除结果
     * 
     * @param Ids
     *            购物车id集合
     * @return 删除结果
     */
    @PostMapping("shopDelCart")
    public R shopDelCart(@RequestBody List<Long> Ids) {
@@ -248,8 +270,10 @@

    /**
     * 查询用户收货地址列表
     * @param comShopAddressDTO    请求参数
     * @return  用户收获地址列表
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 用户收获地址列表
     */
    @PostMapping("shopUserAddressList")
    public R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO) {
@@ -258,8 +282,10 @@

    /**
     * 用户添加书货地址
     * @param comShopAddressDTO 请求参数
     * @return  添加结果
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 添加结果
     */
    @PostMapping("shopAddUserAddress")
    public R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
@@ -268,8 +294,10 @@

    /**
     * 用户修改收货地址
     * @param comShopAddressDTO 请求参数
     * @return  修改结果
     * 
     * @param comShopAddressDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("shopEditUserAddress")
    public R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO) {
@@ -278,8 +306,10 @@

    /**
     * 用户删除收货地址
     * @param addressId 收货地址id
     * @return  删除结果
     * 
     * @param addressId
     *            收货地址id
     * @return 删除结果
     */
    @PostMapping("shopDelUserAddress")
    public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
@@ -288,8 +318,10 @@

    /**
     * 订单预览
     * @param orderPreviewDTO   请求参数
     * @return  订单预览数据
     * 
     * @param orderPreviewDTO
     *            请求参数
     * @return 订单预览数据
     */
    @PostMapping("orderPreview")
    public R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO) {
@@ -298,8 +330,10 @@

    /**
     * 创建订单
     * @param orderCreateDTO    创建订单请求参数
     * @return  创建结果
     * 
     * @param orderCreateDTO
     *            创建订单请求参数
     * @return 创建结果
     */
    @PostMapping("orderCreate")
    public R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO) {
@@ -308,18 +342,22 @@

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

    /**
     * 根据订单id查询订单详情
     * @param orderId   订单id
     * @return  订单详情
     * 
     * @param orderId
     *            订单id
     * @return 订单详情
     */
    @PostMapping("orderDetail")
    public R orderDetail(@RequestParam("orderId") Long orderId) {
@@ -328,8 +366,10 @@

    /**
     * 根据订单id取消订单
     * @param comShopOrderQueryDTO   请求参数
     * @return  取消结果
     * 
     * @param comShopOrderQueryDTO
     *            请求参数
     * @return 取消结果
     */
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
@@ -338,8 +378,10 @@

    /**
     * 根据订单id删除订单
     * @param orderId   订单id
     * @return  删除结果
     * 
     * @param orderId
     *            订单id
     * @return 删除结果
     */
    @PostMapping("orderDelete")
    public R orderDelete(@RequestParam("orderId") Long orderId) {
@@ -348,30 +390,33 @@

    /**
     * 根据订单id确认收货
     * @param comShopOrderQueryDTO   请求参数
     * @return  确认结果
     * 
     * @param comShopOrderQueryDTO
     *            请求参数
     * @return 确认结果
     */
    @PostMapping("orderConfirm")
    public R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
        return comShopOrderService.orderConfirm(comShopOrderQueryDTO.getOrderId(), comShopOrderQueryDTO.getPhone());
    }

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




    /**
     * 商品列表-分页查询
     * @param pageComShopGoodsDTO 查询参数
     * 
     * @param pageComShopGoodsDTO
     *            查询参数
     * @return PageShopStoreVO
     */
    @PostMapping("pageGoods")
@@ -381,6 +426,7 @@

    /**
     * 新增商品
     * 
     * @param addShopGoodsVO
     * @return
     */
@@ -391,18 +437,21 @@

    /**
     * 编辑商品
     * 
     * @param addShopGoodsVO
     * @param id 商铺Id
     * @param id
     *            商铺Id
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("editShopGoods/{id}")
    public R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO) {
    public R editShopGoods(@PathVariable("id") Long id, @RequestBody AddShopGoodsVO addShopGoodsVO) {
        return comShopGoodsService.editShopGoods(id, addShopGoodsVO);
    }

    /**
     * 删除商品
     * 
     * @param id
     * @return
     */
@@ -413,16 +462,18 @@

    /**
     * 修改商品状态
     * 
     * @param id
     * @return
     */
    @GetMapping("changeShopGoodsStatus")
    public R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status) {
        return comShopGoodsService.changeStatus(id,status);
    public R changeStatus(@RequestParam("id") Long id, @RequestParam("status") Integer status) {
        return comShopGoodsService.changeStatus(id, status);
    }

    /**
     * 商家资金的订单详情
     * 
     * @param id
     * @return
     */
@@ -433,104 +484,121 @@

    /**
     * 订单发货
     * @param orderShipDTO 发货信息
     * 
     * @param orderShipDTO
     *            发货信息
     * @return 发货结果
     */
    @PostMapping("/shipOrder")
    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO){
    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        return comShopOrderService.shipOrder(orderShipDTO);
    }

    /**
     * 订单配送
     * @param deliverDTO 订单ID
     * 
     * @param deliverDTO
     *            订单ID
     * @return 配送结果
     */
    @PostMapping("/deliverOrder")
    R deliverOrder(@RequestBody  ComShopOrderDeliverDTO deliverDTO){
    R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.deliverOrder(deliverDTO);
    }

    /**
     * 订单配送
     * @param deliverDTO 订单ID
     * 
     * @param deliverDTO
     *            订单ID
     * @return 配送完成
     */
    @PostMapping("/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO) {
        return comShopOrderService.finishDeliverOrder(deliverDTO);
    }

    /**
     * 订单导出信息
     * @param comShopOrderExportDTO 订单导出信息
     * @return  订单导出信息
     * 
     * @param comShopOrderExportDTO
     *            订单导出信息
     * @return 订单导出信息
     */
    @PostMapping("/shopOrderExportData")
    R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO){
    R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO) {
        return comShopOrderService.shopOrderExportData(comShopOrderExportDTO);
    }

    /**
     * 资金管理导出信息
     * @param comShopFundsExportDTO 资金管理导出信息
     * @return  资金管理导出信息
     * 
     * @param comShopFundsExportDTO
     *            资金管理导出信息
     * @return 资金管理导出信息
     */
    @PostMapping("/shopOrderFundsExportData")
    R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO){
    R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO) {
        return comShopOrderService.shopOrderFundsExportData(comShopFundsExportDTO);
    }


    /**
     * 用户资金统计信息
     * @param userId 用户ID
     * 
     * @param userId
     *            用户ID
     * @return 统计信息
     */
    @GetMapping("/getFundsStat")
    R getFundsStat(@RequestParam("userId") Long userId){
    R getFundsStat(@RequestParam("userId") Long userId) {
        return comShopOrderService.getFundsStat(userId);
    }

    /**
     * 店铺资金统计信息
     * @param pageComShopFundsSearchDTO 店铺资金
     * @return  店铺资金统计信息
     * 
     * @param pageComShopFundsSearchDTO
     *            店铺资金
     * @return 店铺资金统计信息
     */
    @PostMapping("/pageShopFunds")
    R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO){
    R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO) {
        return comShopOrderService.pageShopFunds(pageComShopFundsSearchDTO);
    }

    /**
     * 微信支付订单回调
     * @param wxPayNotifyOrderDTO   订单支付回调参数
     * 
     * @param wxPayNotifyOrderDTO
     *            订单支付回调参数
     */
    @PostMapping("/wxOrderPayNotify")
    public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO){
    public void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO) {
        comShopOrderService.wxOrderPayNotify(wxPayNotifyOrderDTO);
    }

    /**
     * 点击去支付订单
     * @param orderPayDTO   请求参数
     * @return  支付对象
     * 
     * @param orderPayDTO
     *            请求参数
     * @return 支付对象
     */
    @PostMapping("/wxPay")
    public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
        return  comShopOrderService.wxPay(orderPayDTO);
    public R wxPay(@RequestBody OrderPayDTO orderPayDTO) {
        return comShopOrderService.wxPay(orderPayDTO);
    }



    /**
     * 商城系统配置
     * 
     * @param comShopSysConfDTO
     * @return
     */
    @PostMapping("/conf/edit")
    R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO){
    R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO) {
        ComShopSysConfDO comShopSysConfDO = comShopSysConfService.getBaseMapper().selectById(comShopSysConfDTO.getId());
        switch (comShopSysConfDTO.getHidden()){
        switch (comShopSysConfDTO.getHidden()) {
            case 0:
                comShopSysConfDO.setVal("0");
                comShopSysConfDO.setEnabled("1");
@@ -539,10 +607,11 @@
                comShopSysConfDO.setVal("1");
                comShopSysConfDO.setEnabled("1");
                break;
            default: break;
            default:
                break;
        }
        int updated = comShopSysConfService.getBaseMapper().updateById(comShopSysConfDO);
        if(updated==1){
        if (updated == 1) {
            return R.ok();
        }
        return R.fail();
@@ -550,16 +619,17 @@

    /**
     * 商城系统配置查询
     * 
     * @param pageComShopSysConfDTO
     * @return
     */
    @PostMapping("/conf/get")
    R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO){
        List<ComShopSysConfDO> confList = comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
                        .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN")
                        .orderByDesc(ComShopSysConfDO::getCreate_at));
    R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO) {
        List<ComShopSysConfDO> confList =
            comShopSysConfService.getBaseMapper().selectList(new LambdaQueryWrapper<ComShopSysConfDO>()
                .eq(ComShopSysConfDO::getName, "SHOP_HIDDEN").orderByDesc(ComShopSysConfDO::getCreate_at));
        ComShopSysConfVO comShopSysConfVO = new ComShopSysConfVO();
        if(confList!=null && confList.size()>0){
        if (confList != null && confList.size() > 0) {
            ComShopSysConfDO firstConf = confList.get(0);
            BeanUtils.copyProperties(firstConf, comShopSysConfVO);
            return R.ok(comShopSysConfVO);