小程序 接口开发

rk

10 小时以前 c6675b55023dff3c4f441ab0bb9493198949126e

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

@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.web.ApiController;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.config.annotation.LoginShopRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.kuaidi100.DeliveryDTO;
import com.doumee.core.utils.kuaidi100.ExpressUtils;
@@ -14,10 +16,7 @@
import com.doumee.dao.business.model.MemberCoupon;
import com.doumee.dao.business.model.Shop;
import com.doumee.dao.web.dto.CouponDTO;
import com.doumee.dao.web.request.OrderPayRequest;
import com.doumee.dao.web.request.PageRequest;
import com.doumee.dao.web.request.PayDetailRequest;
import com.doumee.dao.web.request.ShopOrderPayRequest;
import com.doumee.dao.web.request.*;
import com.doumee.dao.web.request.goods.DealOrderRequest;
import com.doumee.dao.web.request.goods.MemberOrderRequest;
import com.doumee.dao.web.request.goods.OrderCommentRequest;
@@ -135,19 +134,16 @@
        return ApiResponse.success("查询成功", memberCouponService.getApplyCoupon(requestList,getMemberId()));
    }

    @LoginRequired
    @ApiOperation("经销商列表")
    @PostMapping("/shopPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<IPage<Shop>> shopPage(@RequestBody PageWrap<Shop> pageWrap) {
        IPage<Shop> page = goodsorderService.getShopPage(pageWrap);
        return ApiResponse.success("查询成功",page);
    }

    @Autowired
    public MemberCouponServiceImpl memberCouponServiceImpl;
//    @LoginRequired
//    @ApiOperation("经销商列表")
//    @PostMapping("/shopPage")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse<IPage<Shop>> shopPage(@RequestBody PageWrap<Shop> pageWrap) {
//        IPage<Shop> page = goodsorderService.getShopPage(pageWrap);
//        return ApiResponse.success("查询成功",page);
//    }

    @LoginRequired
    @ApiOperation("订单支付")
@@ -299,4 +295,30 @@
        return ApiResponse.success("操作成功",deliveryDTO);
    }



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


    @LoginShopRequired
    @ApiOperation("订单详情 - 经销商")
    @GetMapping("/shopOrderDetail")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "orderId", value = "订单主键", required = true),
    })
    public ApiResponse<MemberOrderResponse> shopOrderDetail(@RequestParam Integer orderId) {
        return ApiResponse.success("查询成功", goodsorderService.getGoodsOrderDetail(orderId));
    }

}