Merge remote-tracking branch 'origin/master'

doum

10 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

@@ -21,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;
@@ -163,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));
    }

@@ -288,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({
@@ -297,6 +313,11 @@
        return ApiResponse.success("操作成功",goodsorderService.ordersStatistics(getMemberId()));
    }






    @LoginRequired
    @ApiOperation("物流查询")
    @GetMapping("/queryExpress")