modify

Helius

2021-06-28 1f2deeadddd52a23271c8df479912051c44f8f2d

modify

 gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java

@@ -5,6 +5,7 @@
import com.xzx.gc.common.request.BaseController;
import com.xzx.gc.model.JsonResult;
import com.xzx.gc.order.dto.AddJhyOrderDto;
import com.xzx.gc.order.dto.JhyOrderConfirmDto;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.service.JhyOrderService;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
@@ -68,14 +69,14 @@

    @ApiOperation("取消订单")
    @PostMapping(value = "/jhy/order/cancel/{orderId}")
    public Result<String> cancelOrder(Long orderId, HttpServletRequest request) {
    public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
        jhyOrderService.cancelOrder(orderId, getUserId(request));
        return null;
    }

    @ApiOperation("确认订单-支付")
    @PostMapping(value = "/jhy/order/confirm")
    public Result<String> confirmOrder() {
    public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto) {
        return null;
    }


 gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java

@@ -1,7 +1,10 @@
package com.xzx.gc.order.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

/**
 * @author wzy
@@ -11,6 +14,9 @@
@ApiModel(value = "JhyOrderConfirmDto")
public class JhyOrderConfirmDto {

    @ApiModelProperty(value = "订单ID")
    private Long orderId;

    @ApiModelProperty(value = "明细")
    private List<JhyOrderConfirmItemsDto> items;
}

 gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmItemsDto.java

New file
@@ -0,0 +1,21 @@
package com.xzx.gc.order.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @author wzy
 * @date 2021-06-28
 **/
@Data
@ApiModel(value = "JhyOrderConfirmItemsDto")
public class JhyOrderConfirmItemsDto {

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "重量")
    private String weight;

}