调试

MrShi

12 小时以前 ac33a3140ef8ef20dfd2537fce2dfdd0f374f30e

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java

@@ -8,6 +8,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.kuaidi100.DeliveryDTO;
import com.doumee.core.utils.kuaidi100.ExpressUtils;
import com.doumee.core.wx.SendWxMessage;
@@ -20,11 +21,13 @@
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
import com.doumee.dao.web.request.goods.OrderPayConfirmRequest;
import com.doumee.dao.web.response.MemberCouponResponse;
import com.doumee.dao.web.response.MyPageResponse;
import com.doumee.dao.web.response.OrderCommentResponse;
import com.doumee.dao.web.response.OrderDetailResponse;
import com.doumee.dao.web.response.goods.MemberOrderResponse;
import com.doumee.dao.web.response.goods.OrderPayConfirmResponse;
import com.doumee.dao.web.response.goods.PayResponse;
import com.doumee.service.business.HotCityService;
import com.doumee.service.business.impl.MemberCouponServiceImpl;
@@ -162,7 +165,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<PayResponse> orderPay(@RequestParam Integer orderId) {
    public ApiResponse<PayResponse> replayPay(@RequestParam Integer orderId) {
        return ApiResponse.success("操作成功", goodsorderService.replayPay(orderId));
    }

@@ -177,17 +180,19 @@
        return ApiResponse.success("查询成功", goodsorderService.getGoodsOrderDetail(orderId));
    }

    @LoginRequired
    @ApiOperation("订单列表")
    @PostMapping("/orderPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<IPage<MemberOrderResponse>> orderPage(@RequestBody PageWrap<MemberOrderRequest> pageWrap) {
        pageWrap.getModel().setMemberId(getMemberId());
        IPage<MemberOrderResponse> page = goodsorderService.getGoodsOrderPage(pageWrap);
        return ApiResponse.success("查询成功",page);
    }
//    @LoginRequired
//    @ApiOperation("订单列表")
//    @PostMapping("/orderPage")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse<IPage<MemberOrderResponse>> orderPage(@RequestBody PageWrap<MemberOrderRequest> pageWrap) {
//        pageWrap.getModel().setMemberId(getMemberId());
//        IPage<MemberOrderResponse> page = goodsorderService.getGoodsOrderPage(pageWrap);
//        return ApiResponse.success("查询成功",page);
//    }



    @LoginRequired
    @ApiOperation("修改订单收货地址")
@@ -235,16 +240,29 @@
    }


    @LoginRequired
    @LoginShopRequired
    @ApiOperation("订单核销")
    @PostMapping("/writeOffOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse writeOffOrder(@RequestBody DealOrderRequest dealOrderRequest) {
        goodsorderService.orderWriteOff(dealOrderRequest.getExchangeCode(),getMemberId());
        goodsorderService.orderWriteOff(dealOrderRequest.getOrderId(),getShopId());
        return ApiResponse.success("操作成功");
    }


    @LoginShopRequired
    @ApiOperation("根据核销码获取订单详情")
    @PostMapping("/getOrderDetailByCode")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<MemberOrderResponse> getOrderDetailByCode(@RequestBody DealOrderRequest dealOrderRequest) {
        return ApiResponse.success("操作成功",goodsorderService.getGoodsOrderDetailByCode(dealOrderRequest.getExchangeCode()));
    }



    @LoginRequired
    @ApiOperation("订单删除")
@@ -272,6 +290,20 @@
    }

    @LoginRequired
    @ApiOperation("订单待支付信息")
    @PostMapping("/orderPayConfirm")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<OrderPayConfirmResponse> orderPayConfirm(@RequestBody OrderPayConfirmRequest request) {
        request.setMemberId(getMemberId());
        return ApiResponse.success("操作成功",goodsorderService.orderPayConfirm(request,memberCouponServiceImpl));
    }




    @LoginRequired
    @ApiOperation("订单统计")
    @GetMapping("/ordersStatistics")
    @ApiImplicitParams({
@@ -280,6 +312,11 @@
    public ApiResponse<MyPageResponse> ordersStatistics() {
        return ApiResponse.success("操作成功",goodsorderService.ordersStatistics(getMemberId()));
    }






    @LoginRequired
    @ApiOperation("物流查询")
@@ -305,11 +342,25 @@
    })
    public ApiResponse<PageData<Goodsorder>> shopOrderPage(@RequestBody PageWrap<ShopOrderRequest> pageWrap) {
        pageWrap.getModel().setShopId(getShopId());
        pageWrap.getModel().setUserType(Constants.ONE);
        PageData<Goodsorder> page = goodsorderService.shopOrderPage(pageWrap);
        return ApiResponse.success("查询成功",page);
    }


    @LoginRequired
    @ApiOperation("订单列表")
    @PostMapping("/orderPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<PageData<Goodsorder>> orderPage(@RequestBody PageWrap<ShopOrderRequest> pageWrap) {
        pageWrap.getModel().setShopId(getMemberId());
        pageWrap.getModel().setUserType(Constants.ZERO);
        PageData<Goodsorder> page = goodsorderService.shopOrderPage(pageWrap);
        return ApiResponse.success("查询成功",page);
    }

    @LoginShopRequired
    @ApiOperation("订单详情 - 经销商")
    @GetMapping("/shopOrderDetail")