#feat 订单发货

yanghui

2022-11-26 476d4540fb5928307219cebcc02e6821bcdd07b4

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopFlowerApi.java

@@ -8,6 +8,7 @@
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointOrderVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO;
@@ -130,7 +131,7 @@
    }

    @ApiOperation(value = "删除用户收货地址列表")
    @PostMapping("shopDelUserAddress")
    @DeleteMapping("shopDelUserAddress")
    @ApiImplicitParam(name = "addressId", value = "收货地址id", required = true)
    public R shopDelUserAddress(@RequestParam("addressId") Long addressId) {
        return communityService.shopFlowerDelUserAddress(addressId);
@@ -160,7 +161,7 @@
        return communityService.orderCreateFlower(orderCreateDTO);
    }

    @ApiOperation(value = "分页查询订单列表", response = ComShopOrderPageVO.class)
    @ApiOperation(value = "分页查询订单列表", response = ComShopFlowerOrderPageVO.class)
    @PostMapping("pageOrderList")
    public R pageOrderList(@RequestBody PageComFlowerOrderListDTO comOrderListDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
@@ -171,8 +172,8 @@
        return communityService.pageOrderListFlower(comOrderListDTO);
    }

    @ApiOperation(value = "查询订单详情", response = ComShopOrderPageVO.class)
    @PostMapping("orderDetail")
    @ApiOperation(value = "查询订单详情", response = ComShopFlowerOrderPageVO.class)
    @GetMapping("orderDetail")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R orderDetail(@RequestParam("orderId") Long orderId) {
        return communityService.orderDetailFlower(orderId);
@@ -189,10 +190,10 @@
    }

    @ApiOperation(value = "删除订单")
    @PostMapping("orderDelete")
    @DeleteMapping("orderDelete")
    @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
    public R orderDelete(@RequestParam("orderId") Long orderId) {
        return communityService.orderDelete(orderId);
        return communityService.orderDeleteFlower(orderId);
    }

    @ApiOperation(value = "订单确认收货")
@@ -247,6 +248,7 @@
                return R.fail(501, "填写内容存在 " + result + " 违规信息");
            }
        }
        comShopFlowerEvaluateDTO.setUserId(this.getUserId());
        return communityService.saveEvaluate(comShopFlowerEvaluateDTO);
    }

@@ -351,7 +353,7 @@
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class)
    @ApiOperation(value = "未配送-开始配送-订单列表", response = ConvenientElevatingPointOrderVO.class)
    @PostMapping("pageNoDeliveryOrderList")
    public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) {
        return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO);
@@ -391,6 +393,7 @@
    @PostMapping("createRefundOrder")
    @ApiOperation(value = "创建退款订单")
    public R createRefundOrder(@RequestBody ComShopFlowerRefundOrderDTO comShopFlowerRefundOrderDTO) {
        comShopFlowerRefundOrderDTO.setUserId(this.getUserId());
        return communityService.createRefundOrder(comShopFlowerRefundOrderDTO);
    }

@@ -403,7 +406,9 @@
    @PostMapping("pageRefundOrder")
    @ApiOperation(value = "退款订单分页查询 用户", response = ComShopFlowerRefundOrderVO.class)
    public R pageRefundOrder(@RequestBody PageComOrderRefundDTO pageComOrderRefundDTO) {
        pageComOrderRefundDTO.setUserId(this.getUserId());
        if (null == pageComOrderRefundDTO.getStoreId()){
            pageComOrderRefundDTO.setUserId(this.getUserId());
        }
        return communityService.pageRefundOrder(pageComOrderRefundDTO);
    }

@@ -452,6 +457,7 @@
     * @return
     */
    @GetMapping("incrGoodsView")
    @ApiOperation(value = "新增商品浏览量")
    public R incrGoodsView(@RequestParam("goodsId") Long goodsId) {
        return communityService.incrGoodsView(goodsId);
    }
@@ -484,4 +490,50 @@
    public R getQuota(@RequestParam("storeId") Long storeId){
        return communityService.getQuota(storeId);
    }

    /**
     * 取消退款
     * @param id
     * @return
     */
    @ApiOperation(value = "取消退款")
    @GetMapping("refundOrderCancel")
    public R refundOrderCancel(@RequestParam("id") Long id){
        return communityService.refundOrderCancel(id);
    }

    /**
     * 退款订单详情
     * @param id
     * @return
     */
    @ApiOperation(value = "退款订单详情",response = ComShopFlowerRefundOrderVO.class)
    @GetMapping("refundOrderDetail")
    public R refundOrderDetail(Long id){
        return communityService.refundOrderDetail(id);
    }

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("pageOrderByDeliveryNo")
    @ApiOperation(value = "清点商品 确认送达详情",response = ComShopFlowerOrderDeliveryNoListVO.class)
    public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
        return communityService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
    }


    /**
     * 订单发货
     *
     * @param orderShipDTO 发货信息
     * @return 发货结果
     */
    @PostMapping("/shipOrderFlower")
    @ApiOperation(value = "订单发货")
    public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) {
        return communityService.shipOrderFlower(orderShipDTO);
    }
}