fix

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) {

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;
 }

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;
 }

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -31,6 +31,7 @@
         <result property="timeout"           column="timeout_"/>
         <result property="timeoutFineTimes"  column="timeout_fine_times"/>
         <result property="isCall" column="is_call" />
+        <result property="serverMoney" column="server_money" />
     </resultMap>
 
     <sql id="selectOrderMaster">
@@ -57,7 +58,8 @@
                goods_id,
                timeout_,
                timeout_fine_times,
-               is_call
+               is_call,
+               order_mode
         FROM order_master
     </sql>
     <sql id="selectOrderMasterMoreInfo">
@@ -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