|
|
@@ -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);
|
