|
|
@@ -63,14 +63,12 @@ public class OrderController {
|
|
|
orderMap.put("id", order.getId());
|
|
|
orderMap.put("orderNo", order.getOrderNo());
|
|
|
orderMap.put("outTradeNo", order.getOutTradeNo());
|
|
|
- orderMap.put("hahaOrderNo", order.getHahaOrderNo());
|
|
|
orderMap.put("deviceSn", order.getDeviceId());
|
|
|
orderMap.put("totalAmount", order.getTotalAmount());
|
|
|
orderMap.put("payStatus", order.getPayStatus());
|
|
|
orderMap.put("status", order.getStatus());
|
|
|
orderMap.put("createTime", order.getCreateTime());
|
|
|
orderMap.put("payTime", order.getPayTime());
|
|
|
- orderMap.put("videoUrl", order.getVideoUrl());
|
|
|
orderMap.put("confidence", order.getConfidence());
|
|
|
|
|
|
// 解析商品信息
|
|
|
@@ -181,14 +179,12 @@ public class OrderController {
|
|
|
orderDetail.put("id", order.getId());
|
|
|
orderDetail.put("orderNo", order.getOrderNo());
|
|
|
orderDetail.put("outTradeNo", order.getOutTradeNo());
|
|
|
- orderDetail.put("hahaOrderNo", order.getHahaOrderNo());
|
|
|
orderDetail.put("deviceSn", order.getDeviceId());
|
|
|
orderDetail.put("totalAmount", order.getTotalAmount());
|
|
|
orderDetail.put("payStatus", order.getPayStatus());
|
|
|
orderDetail.put("status", order.getStatus());
|
|
|
orderDetail.put("createTime", order.getCreateTime());
|
|
|
orderDetail.put("payTime", order.getPayTime());
|
|
|
- orderDetail.put("videoUrl", order.getVideoUrl());
|
|
|
orderDetail.put("confidence", order.getConfidence());
|
|
|
|
|
|
// 解析商品信息
|
skyline