|
|
@@ -60,6 +60,7 @@ public class OrderController {
|
|
|
Map<String, Object> orderMap = new HashMap<>();
|
|
|
orderMap.put("id", order.getId());
|
|
|
orderMap.put("orderNo", order.getOrderNo());
|
|
|
+ orderMap.put("orderName", order.getOrderName() != null ? order.getOrderName() : "");
|
|
|
orderMap.put("outTradeNo", order.getOutTradeNo());
|
|
|
orderMap.put("deviceId", order.getDeviceId());
|
|
|
orderMap.put("totalAmount", order.getTotalAmount());
|
|
|
@@ -157,6 +158,7 @@ public class OrderController {
|
|
|
Map<String, Object> orderDetail = new HashMap<>();
|
|
|
orderDetail.put("id", order.getId());
|
|
|
orderDetail.put("orderNo", order.getOrderNo());
|
|
|
+ orderDetail.put("orderName", order.getOrderName() != null ? order.getOrderName() : "");
|
|
|
orderDetail.put("outTradeNo", order.getOutTradeNo());
|
|
|
orderDetail.put("deviceId", order.getDeviceId());
|
|
|
orderDetail.put("totalAmount", order.getTotalAmount());
|