diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index c29b7b56..2cd1e492 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -218,6 +218,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setTimeout(master.getTimeout()); orderListResponse.setTimeoutFineTimes(master.getTimeoutFineTimes()); orderListResponse.setAfterServiceRecordList(afterServiceRecords); + orderListResponse.setServerMoney(master.getServerMoney()); orderListResponses.add(orderListResponse); }); @@ -591,6 +592,7 @@ public class OrderMasterController extends BaseController { orderListResponse.setTimeoutFineTimes(orderMaster.getTimeoutFineTimes()); orderListResponse.setFinalRecvMoney(finalRecvMoney); orderListResponse.setGoodsAreaList(goods.getGoodsAreaList()); + orderListResponse.setOrderMode(orderMaster.getOrderMode()); return AjaxResult.success(orderListResponse); } catch (Exception e) { diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index 29843eed..026c8b62 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java @@ -147,4 +147,6 @@ public class OrderListResponse { * 超时扣款次数 */ private Integer timeoutFineTimes; + + private String orderMode; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 427dc6e4..e7f7be28 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -149,4 +149,5 @@ public class OrderMaster extends BaseEntity { * */ private String isCall; + private BigDecimal serverMoney; } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 7bb03c12..54331221 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -31,6 +31,7 @@ + @@ -57,7 +58,8 @@ goods_id, timeout_, timeout_fine_times, - is_call + is_call, + order_mode FROM order_master @@ -84,7 +86,8 @@ om.goods_id, om.timeout_, om.timeout_fine_times, - om.is_call + om.is_call, + fm.server_money FROM order_master om LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id LEFT JOIN goods g ON g.goods_id = om.goods_id