Add:互调接口

DESKTOP-71BH0QO\L、ming

2021-04-19 3719f9e613c3afa9a801252458d5486915c7bfb0

Add:互调接口

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

@@ -7,9 +7,7 @@
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.ChangePasswordVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
@@ -110,7 +108,7 @@
    }


    @ApiOperation(value = "分页查询商品", response = PageShopStoreVO.class)
    @ApiOperation(value = "分页查询商品", response = PageShopGoodsVO.class)
    @PostMapping("/goods/page")
    public R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO) {
        return communityService.pageGoodsList(pageComShopGoodsDTO);
@@ -137,11 +135,18 @@
    }

    @ApiOperation(value = "商品上下架")
    @ApiImplicitParams({@ApiImplicitParam(value = "id",name = "商品Id"),
        @ApiImplicitParam(value = "status",name = "1.上架  2.下架 ")})
    @ApiImplicitParams({@ApiImplicitParam(name = "id",value = "商品Id"),
        @ApiImplicitParam(name = "status",value = "1.上架  2.下架 ")})
    @GetMapping("/goods/changeStatus")
    R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status) {
        return communityService.changeStatus(id,status);
    }

    @ApiOperation(value = "商家资金的订单详情",response = CapitalDetailVO.class)
    @ApiImplicitParam(name = "id",value = "订单Id")
    @GetMapping("/order/capitalDetailByStore")
    R capitalDetailByStore(@RequestParam("id") Long id){
        return communityService.capitalDetailByStore(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalDetailVO.java

New file
@@ -0,0 +1,33 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @auther llming
 * @describe 商家订单资金详情
 */
@Data
public class CapitalDetailVO {
    @ApiModelProperty(value = "商家账号")
    private String storeAccount;
    @ApiModelProperty(value = "商家姓名")
    private String contacts;
    @ApiModelProperty(value = "店铺名称")
    private String storeName;
    @ApiModelProperty(value = "金额（元）")
    private BigDecimal totalAmount;
    @ApiModelProperty("支付方式（1.微信支付）")
    private Integer payType;
    @ApiModelProperty("类型")
    private String type;
    @ApiModelProperty("支付时间")
    private Date payTime;
    @ApiModelProperty("下单时间")
    private Date createAt;
    @ApiModelProperty("订单号")
    private String orderNo;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/CapitalPageVO.java

New file
@@ -0,0 +1,31 @@
package com.panzhihua.common.model.vos.shop;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
 * @auther llming
 * @describe 商家订单资金列表
 */
@Data
public class CapitalPageVO {
    @ApiModelProperty(value = "商家账号")
    private String storeAccount;
    @ApiModelProperty(value = "商家姓名")
    private String contacts;
    @ApiModelProperty(value = "店铺名称")
    private String storeName;
    @ApiModelProperty(value = "金额（元）")
    private BigDecimal payAmount;
    @ApiModelProperty(value = "订单Id")
    private Long orderId;
    @ApiModelProperty("支付方式（1.微信支付）")
    private Integer payType;
    @ApiModelProperty("类型")
    private String type="订单收入";
    @ApiModelProperty("支付时间")
    private Date payTime;
}

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

@@ -22,6 +22,7 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;

/**
@@ -1836,7 +1837,7 @@
     * @param id
     * @return
     */
    @PostMapping("/shop/changeShopGoodsStatus")
    @GetMapping("/shop/changeShopGoodsStatus")
    R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
    /**
     * 结果
@@ -2019,4 +2020,12 @@
     */
    @PostMapping("/shop/orderStatistics")
    R orderStatistics(@RequestParam("userId") Long userId);

    /**
     * 商家资金的订单详情
     * @param id
     * @return
     */
    @GetMapping("/shop/capitalDetailByStore")
    R capitalDetailByStore(@RequestParam("id") Long id);
}

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

@@ -20,6 +20,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.NotNull;

@@ -322,7 +323,7 @@


    /**
     * 商品列表-分页查询
     * 商品列表-分页查询-运营后台
     * @param pageComShopGoodsDTO 查询参数
     * @return PageShopStoreVO
     */
@@ -362,8 +363,9 @@
        return comShopGoodsService.deleteShopGoods(id);
    }


    /**
     * 删除商品
     * 修改商品状态
     * @param id
     * @return
     */
@@ -372,4 +374,14 @@
        return comShopGoodsService.changeStatus(id,status);
    }

    /**
     * 商家资金的订单详情
     * @param id
     * @return
     */
    @GetMapping("capitalDetailByStore")
    public R capitalDetailByStore(@RequestParam("id") Long id) {
        return comShopOrderService.capitalDetailByStore(id);
    }

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java

@@ -4,17 +4,13 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.vos.shop.ComShopOrderPageVO;
import com.panzhihua.common.model.vos.shop.ComShopOrderVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.vos.shop.ComShopOrderVO;
import com.panzhihua.common.model.vos.shop.PageShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Select;

/**
@@ -46,4 +42,20 @@
            "</script>")
    IPage<ComShopOrderVO> pageOrderBy(PageDTO page,@Param("pageComShopOrderSearchDTO")  PageComShopOrderSearchDTO pageComShopOrderSearchDTO);

    @Select("<script> " +
            "SELECT\n" +
            "css.store_account,\n" +
            "css.`contacts`,\n" +
            "css.`name` as storeName,\n" +
            "cso.total_amount,\n" +
            "cso.pay_type,\n" +
            "cso.pay_time, \n" +
            "cso.create_at, \n" +
            "cso.order_no\n" +
            "FROM\n" +
            "com_shop_order cso\n" +
            "left JOIN com_shop_store css on cso.store_id=css.id \n" +
            "where cso.id =#{id} "+
            "</script>")
    CapitalDetailVO capitalDetailByStore(@Param("id")Long id);
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOperLogDO.java

@@ -1,5 +1,7 @@
package com.panzhihua.service_community.model.dos;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@@ -21,6 +23,7 @@
    /**
     * 日志主键
     */
    @TableId(type = IdType.AUTO)
    private Long operId;

    /**

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java

@@ -1,11 +1,7 @@
package com.panzhihua.service_community.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;

@@ -80,4 +76,11 @@
     */
    R orderStatistics(Long userId);

    /**
     * 商家资金的订单详情
     * @param id 订单id
     * @return
     */
    R capitalDetailByStore(Long id);

}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java

@@ -3,18 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.dao.ComShopOrderDAO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateGoodsDTO;
import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.utlis.OrderNoUtils;
import com.panzhihua.common.utlis.StringUtils;
@@ -58,6 +52,7 @@

    /**
     * 订单预览
     *
     * @param orderPreviewDTO   请求参数
     * @return  订单预览数据
     */
@@ -172,6 +167,7 @@

    /**
     * 创建订单
     *
     * @param orderCreateDTO    创建订单请求参数
     * @return  创建结果
     */
@@ -285,6 +281,7 @@

    /**
     * 分页查询用户订单列表
     *
     * @param comOrderListDTO   请求参数
     * @return  查询结果
     */
@@ -324,6 +321,7 @@

    /**
     * 根据订单id查询订单详情
     *
     * @param orderId   订单id
     * @return  订单详情
     */
@@ -376,6 +374,7 @@

    /**
     * 根据订单id取消订单
     *
     * @param orderId   订单id
     * @param phone 操作用户手机号
     * @return  取消结果
@@ -416,6 +415,7 @@

    /**
     * 根据订单id删除订单
     *
     * @param orderId   订单id
     * @return  删除结果
     */
@@ -440,6 +440,7 @@

    /**
     * 根据订单id确认收货
     *
     * @param orderId   订单id
     * @param phone 手机号
     * @return  确认结果
@@ -479,6 +480,7 @@

    /**
     * 统计用户订单数量
     *
     * @param userId    用户id
     * @return  统计结果
     */
@@ -529,4 +531,16 @@
        this.baseMapper.pageOrderBy(page, pageComShopOrderSearchDTO);
        return null;
    }




    @Override
    public R capitalDetailByStore(Long id) {
        if(id==null){
            R.fail("订单号不能为空！");
        }
        CapitalDetailVO vo = this.baseMapper.capitalDetailByStore(id);
        return R.ok(vo);
    }
}