Commit 477a2560 by 吕明尚

增加订单详情显示页面字段

parent b53f572c
...@@ -53,8 +53,8 @@ public class SConsumerCouponController extends BaseController ...@@ -53,8 +53,8 @@ public class SConsumerCouponController extends BaseController
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SConsumerCoupon sConsumerCoupon) public TableDataInfo list(SConsumerCoupon sConsumerCoupon)
{ {
startPage();
List<SConsumer> list = sConsumerService.list(); List<SConsumer> list = sConsumerService.list();
startPage();
if (share.common.utils.StringUtils.isNotBlank(sConsumerCoupon.getPhone())) { if (share.common.utils.StringUtils.isNotBlank(sConsumerCoupon.getPhone())) {
SConsumer sConsumer = list.stream().filter(obj -> obj.getPhone().equals(sConsumerCoupon.getPhone())).findFirst().orElse(null); SConsumer sConsumer = list.stream().filter(obj -> obj.getPhone().equals(sConsumerCoupon.getPhone())).findFirst().orElse(null);
if (!ObjectUtils.isEmpty(sConsumer)) { if (!ObjectUtils.isEmpty(sConsumer)) {
......
...@@ -14,7 +14,7 @@ public class OpenInterfaceController { ...@@ -14,7 +14,7 @@ public class OpenInterfaceController {
private OpenInterfaceService openInterfaceService; private OpenInterfaceService openInterfaceService;
@GetMapping("/order/info") @GetMapping("/order/info")
public AjaxResult orderInfo(String orderNo) { public AjaxResult orderInfo(@RequestParam("orderNo") String orderNo) {
return AjaxResult.success(openInterfaceService.orderInfo(orderNo)); return AjaxResult.success(openInterfaceService.orderInfo(orderNo));
} }
...@@ -23,7 +23,4 @@ public class OpenInterfaceController { ...@@ -23,7 +23,4 @@ public class OpenInterfaceController {
return R.ok(openInterfaceService.openDoor(orderNo)); return R.ok(openInterfaceService.openDoor(orderNo));
} }
} }
...@@ -88,5 +88,22 @@ public class OrderVo { ...@@ -88,5 +88,22 @@ public class OrderVo {
//优惠卷名称 //优惠卷名称
private String couponName; private String couponName;
//订单状态
private Integer orderType;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
private Integer status;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment