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

admin/control/ordersendlist.php

@@ -292,8 +292,57 @@ class ordersendlistControl extends SystemControl
 
 
         $merchant_list = $merchants_getter($all_mchids);
-        if(!empty($order_list)) {
+        if(!empty($order_list))
+        {
             $order_list = $this->orderFormat($order_list, $merchant_list);
+
+            //补充订单的返销状态，按客户单号判断
+            $mch_orders = array_column($order_list,'mch_order');
+            $mch_orders = array_unique($mch_orders);
+
+            $relate_con = [
+                'refill_order.order_time' => $base_cond['refill_order.order_time'],
+                'refill_order.mch_order' => ['in', $mch_orders],
+                'vr_order.order_state' => ORDER_STATE_SUCCESS,
+                'refill_order.inner_status' => 0
+            ];
+            $relate_list = Model('')->table('refill_order,vr_order')
+                ->join('inner')
+                ->on('refill_order.order_id=vr_order.order_id')
+                ->field("refill_order.order_id,refill_order.mch_order")
+                ->where($relate_con)
+                ->select();
+
+            $relate_order_map = [];
+            foreach ($relate_list as $item) {
+                $relate_order_map[$item['order_id']] = $item['mch_order'];
+            }
+
+            $order_ids = array_column($relate_list, 'order_id');
+            $order_ids = array_unique($order_ids);
+
+            $refill_buyback_model = Model('refill_buyback');
+            $buybacks = $refill_buyback_model->getBuyBackList(['order_id' => ['in', $order_ids], 'manual_type' => 'buyback'], '', 'order_id');
+
+            $mch_order_buyback = [];
+            foreach ($buybacks as $buyback)
+            {
+                $order_id = $buyback['order_id'];
+                $relate_mch_order = $relate_order_map[$order_id];
+                if (!in_array($relate_mch_order, $mch_order_buyback)) {
+                    $mch_order_buyback[] = $relate_mch_order;
+                }
+            }
+
+            foreach ($order_list as $key => $order)
+            {
+                $mch_order = $order['mch_order'];
+                if (in_array($mch_order, $mch_order_buyback)) {
+                    $order_list[$key]['buyback'] = true;
+                } else {
+                    $order_list[$key]['buyback'] = false;
+                }
+            }
         }
 
         Tpl::output('order_list', $order_list);

admin/templates/default/merchant.ratios.php

@@ -105,13 +105,13 @@
                         <th class="align-center w1p">超时时间(秒)</th>
                         <th class="align-center w1p">机构编码</th>
                         <th class="align-center w1p">机构名称</th>
-                        <th class="align-center w10pre">当天</th>
                         <th class="align-center w10pre">15分钟: 总(成功,失败,总订单数) <br> 移 | 联 | 电 (成功单量)</th>
                         <th class="align-center w10pre">30分钟</th>
                         <th class="align-center w10pre">1小时</th>
                         <th class="align-center w10pre">2小时</th>
                         <th class="align-center w10pre">3小时</th>
                         <th class="align-center w10pre">4小时</th>
+                        <th class="align-center w10pre">当天</th>
                 </thead>
                 <tbody class="tbodyd">
                     <?php if (!empty($output['list']) && is_array($output['list'])) { ?>
@@ -121,14 +121,6 @@
                                 <td class="align-center w1pre"><?php echo $k; ?></td>
                                 <td class="align-center w1pre"><?php echo $v['company_name']; ?></td>
                                 <td class="align-center">
-                                    <?php if ($v['ratio']['ALL'][86400][1] > 0) { ?>
-                                        <?php echo ($v['ratio']['ALL'][86400][2] * 100) ?? 0; ?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][86400][0]) ?? 0; ?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][86400][1] - $v['ratio']['ALL'][86400][0]) ?? 0; ?></span>,<?php echo $v['ratio']['ALL'][86400][1]; ?>) <br>
-                                        <?php echo ($v['ratio']['YD'][86400][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['YD'][86400][0]) ?? 0; ?>)￥<?php echo ($v['ratio']['LT'][86400][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['LT'][86400][0]) ?? 0; ?>)￥<?php echo ($v['ratio']['DX'][86400][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['DX'][86400][0]) ?? 0; ?>)
-                                    <?php } else { ?>
-                                        ——
-                                    <?php } ?>
-                                </td>
-                                <td class="align-center">
                                     <?php if ($v['ratio']['ALL'][900][1] > 0) { ?>
                                         <?php echo ($v['ratio']['ALL'][900][2] * 100) ?? 0; ?>%(<span style="color: #2d7255; display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][900][0]) ?? 0; ?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][900][1] - $v['ratio']['ALL'][900][0]) ?? 0; ?></span> ,<?php echo $v['ratio']['ALL'][900][1]; ?>) <br>
                                         <?php echo ($v['ratio']['YD'][900][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['YD'][900][0]) ?? 0; ?>)￥<?php echo ($v['ratio']['LT'][900][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['LT'][900][0]) ?? 0; ?>)￥<?php echo ($v['ratio']['DX'][900][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['DX'][900][0]) ?? 0; ?>)
@@ -176,6 +168,14 @@
                                         ——
                                     <?php } ?>
                                 </td>
+                                <td class="align-center">
+                                    <?php if ($v['ratio']['ALL'][86400][1] > 0) { ?>
+                                        <?php echo ($v['ratio']['ALL'][86400][2] * 100) ?? 0; ?>%(<span style="color: #2d7255;display: inline-block; padding-bottom: 4px;"><?php echo ($v['ratio']['ALL'][86400][0]) ?? 0; ?></span>,<span style="color: red;"><?php echo ($v['ratio']['ALL'][86400][1] - $v['ratio']['ALL'][86400][0]) ?? 0; ?></span>,<?php echo $v['ratio']['ALL'][86400][1]; ?>) <br>
+                                        <?php echo ($v['ratio']['YD'][86400][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['YD'][86400][0]) ?? 0; ?>)￥<?php echo ($v['ratio']['LT'][86400][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['LT'][86400][0]) ?? 0; ?>)￥<?php echo ($v['ratio']['DX'][86400][2] * 100) ?? 0; ?>%(<?php echo ($v['ratio']['DX'][86400][0]) ?? 0; ?>)
+                                    <?php } else { ?>
+                                        ——
+                                    <?php } ?>
+                                </td>
                             </tr>
                         <?php } ?>
                     <?php } else { ?>

admin/templates/default/monitor_transfer.php

@@ -273,6 +273,7 @@
             <th class="align-center">当前耗时</th>
             <th class="align-center">总耗时</th>
             <th class="align-center">订单状态</th>
+            <th class="align-center">返销状态</th>
             <th class="align-center">通道质量</th>
             <th class="align-left">失败原因</th>
             <th class="align-left">商家单号</th>
@@ -340,6 +341,7 @@
                         <?php } ?>
                     </td>
                     <td class="align-center"><?php echo orderState($order); ?></td>
+                    <td class="align-center"><?php echo $order['buyback'] == true ? '已反销': '/';?></td>
                     <td class="align-center"><?php echo $order['quality_text']; ?></td>
                     <td class="align-left"><?php echo $order['err_msg']; ?></td>
                     <td class="align-left"><?php echo $order['mch_order']; ?></td>

data/config/xyz/refill.ini.php

@@ -44,7 +44,7 @@ $config['third_jumps'] = $third_jumps;
 
 #风险流水号管理
 $config['risk_official_sn'] = [
-    'exclude_stores' => [192, 273, 389, 390, 391, 121, 315, 424, 429, 432, 433, 160, 101, 121]
+    'exclude_stores' => [192, 273, 389, 390, 391, 121, 315, 424, 429, 432, 433, 160, 101, 121, 160, 263, 336]
 ];
 
 #不需要检测空号的机构

data/config/yl/refill.ini.php

@@ -63,5 +63,5 @@ $config['sms_mchids'] = [10325, 10361];
 
 #风险流水号管理
 $config['risk_official_sn'] = [
-    'exclude_stores' => [121, 344]
+    'exclude_stores' => [121, 344, 350]
 ];