cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改订单详情->未完成

Browse Source
This commit is contained in:
xuwenbo
2020-09-10 00:21:42 +08:00
parent 9fcd93840e
commit 450af253b1
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderStatusDto.java
View File

@ -5,9 +5,12 @@
*/
package co.yixiang.modules.order.service.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @author hupeng
@ -28,5 +31,9 @@ public class YxStoreOrderStatusDto implements Serializable {
private String changeMessage;
/** 操作时间 */
private Integer changeTime;
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
private Date changeTime;
}

6
yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -127,10 +127,10 @@ public class StoreOrderController {
}
@ApiOperation(value = "根据订单id获取订单详情")
@GetMapping(value = "/getStoreOrderDetail")
@GetMapping(value = "/getStoreOrderDetail/{id}")
@PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')")
public ResponseEntity getYxStoreOrders(@PathVariable Long orderId) {
return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(orderId), HttpStatus.OK);
public ResponseEntity getYxStoreOrders(@PathVariable Long id) {
return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(id), HttpStatus.OK);
}