add:添加订单相关联字段

CeDo

2021-04-20 726f97c55b0937bf0d048313271bdd7a80cdd1f6

 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;

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

    /**
@@ -1836,7 +1837,7 @@
     * @param id
     * @return
     */
    @PostMapping("/shop/changeShopGoodsStatus")
    @GetMapping("/shop/changeShopGoodsStatus")
    R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
    /**
     * 结果
@@ -1854,9 +1855,9 @@
    R pageShopOperLog(@RequestBody PageDTO pageDTO);

    /**
     * 分页查询 商家后台操作日志
     * 订单分页查询
     * @param pageComShopOrderSearchDTO 分页数据
     * @return 分页日志
     * @return 订单分页查询
     */
    @PostMapping("/shop/order/page")
    R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
@@ -2019,4 +2020,76 @@
     */
    @PostMapping("/shop/orderStatistics")
    R orderStatistics(@RequestParam("userId") Long userId);

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


    /**
     * 订单发货
     * @param orderShipDTO 商城订单发货信息
     * @return  发货结果
     */
    @PostMapping("/shop/shipOrder")
    R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);

    /**
     * 订单配送
     * @param deliverDTO 订单信息
     * @return  配送结果
     */
    @PostMapping("/shop/deliverOrder")
    R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 订单完成配送
     * @param deliverDTO 订单信息
     * @return  配送完成结果
     */
    @PostMapping("/shop/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);

    /**
     * 获取用户商户详情
     * @param userId 用户ID
     */
    @GetMapping("/shop/getUserStoreInfo")
    R getUserStoreInfo(@RequestParam("userId") Long userId);

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

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

    /**
     * 店铺资金统计信息
     * @param userId 用户ID
     * @return  店铺资金统计信息
     */
    @GetMapping("/shop/getFundsStat")
    R getFundsStat(@RequestParam("userId") Long userId);

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