Merge branch 'ralb' of 39.97.239.116:gyfl/xyzshop into ralb

admin/control/refill_detail.php

@@ -1,4 +1,5 @@
 <?php
+require_once(BASE_HELPER_PATH . '/refill/util.php');
 
 use refill\util;
 class refill_detailControl extends SystemControl

admin/control/refill_order.php

@@ -325,7 +325,7 @@ class refill_orderControl extends SystemControl
         $condition['refill_order.order_time'] = ['egt', $order_time];
         $condition['refill_order.mchid'] = $mchid;
 
-        $field = 'refill_order.order_sn,refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state';
+        $field = 'refill_order.order_sn,refill_order.commit_time,refill_order.notify_time,refill_order.channel_name,vr_order.order_state,refill_order.err_msg';
         $order_list = $model_refill_order->getMerchantOrderList($condition, 1000, $field);
 
         foreach ($order_list as $order_id => $order_info) {

admin/templates/default/refill.order.index.php

@@ -558,6 +558,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -576,6 +577,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>

admin/templates/default/refill.order.neterr.index.php

@@ -227,6 +227,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -245,6 +246,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>

admin/templates/default/refill.order.notify.err.index.php

@@ -322,6 +322,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -340,6 +341,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>

admin/templates/default/refill.order.send.index.php

@@ -395,6 +395,7 @@
                                          <td class="db-center">${item.diff_time_text}</td>
                                          <td class="db-center">${item.order_state_text}</td>
                                          <td class="db-center">${item.channel_name}</td>
+                                         <td class="db-center">${item.err_msg}</td>
 
 
                              <tr>
@@ -413,6 +414,7 @@
                                          <th class="db-right">耗时</th>
                                          <th class="db-right">订单状态</th>
                                          <th class="db-right">供方名称</th>
+                                         <th class="db-right">错误原因</th>
 
                              </tr>
                     </thead>