edit

app/factory/admin/Order.php

@@ -206,7 +206,11 @@ class Order extends Core
                 if ($order['parent_type'] == 2) {
                     Dever::db('shop/sell_order')->update(array('where_id' => $order['parent_order_id'], 'status' => 4));
 
-                    $ps_info = Dever::db('shop/buy_order_ps')->getData(array('order_id' => $where['order_id']));
+                    $data = Dever::db('shop/buy_order')->getDataToId(array('parent_type' => $order['parent_type'], 'parent_order_id' => $order['parent_order_id']));
+
+                    $data = array_keys($data);
+                    
+                    $ps_info = Dever::db('shop/buy_order_ps')->getData(array('order_id' => $data));
 
                     if ($ps_info) {
                         $sell_order = array('id' => $order['parent_order_id']);

app/factory/template/pc/order_send.php

@@ -7,8 +7,9 @@
 $view
 
 # 定义名称
-->fetch('#update_service_id', 'factory/admin/order.getService') 
-->fetch('.form1@action', 'factory/admin/order.getConfig#send') 
+->fetch('#update_service_c_service_id', 'store/admin/order.getService') 
+->fetch('#update_service_c_0_i_service_id', 'store/admin/order.getService') 
+->fetch('.form1@action', 'store/admin/order.getConfig#send') 
 ->fetch('#update_where_id@value', '<{Dever::input("id")}>') 
 ->fetch('#update_cdate@value', '<{date("Y-m-d H:s")}>') 
 

app/shop/lib/Sell.php

@@ -1091,6 +1091,7 @@ class Sell
     public function updatePs($order, $status = 1, $service_id = -1, $order_num = '')
     {
         $where['order_id'] = $order['id'];
+        $where['clear'] = true;
         $data = Dever::db('shop/sell_order_ps')->find($where);
 
         $service = array();
@@ -1100,14 +1101,11 @@ class Sell
         if ($order_num) {
             $service['order_num'] = $order_num;
         }
-        if ($service) {
-            $service = Dever::array_encode($service);
-        }
-
         if (!$data) {
             $insert = $where;
             if ($service) {
                 $insert['service'][] = $service;
+                $insert['service'] = Dever::array_encode($insert['service']);
             }
             $insert['status'] = $status;
             if ($status == 2) {
@@ -1129,6 +1127,8 @@ class Sell
                 $data['service'] = Dever::array_decode($data['service']);
                 $update['service'] = $data['service'];
                 $update['service'][] = $service;
+
+                $insert['service'] = Dever::array_encode($update['service']);
             }
             Dever::db('shop/sell_order_ps')->update($update);
         }
@@ -1523,7 +1523,7 @@ class Sell
                 $sku = '无';
             }
 
-            if ($info['shop_type'] == 2) {
+            if ($info['shop_type'] == 2 && $info['status'] > 1) {
                 $tui = Dever::url('buy_order_tui?shop_id='.$v['shop_id'].'&order_goods_id=' . $v['id'] . '&order_id=' . $info['id'] . '&cash=' . $v['price'], 'shop');
 
                 $status = '<a href="javascript:;" onclick="fastEdit($(this), \''.$tui.'\', \'退款\', \'\', 1)" class="layui-btn">退款</a>';

app/store/admin/Order.php

@@ -218,7 +218,12 @@ class Order extends Core
                 if ($order['parent_type'] == 2) {
                     Dever::db('shop/sell_order')->update(array('where_id' => $order['parent_order_id'], 'status' => 4));
 
-                    $ps_info = Dever::db('shop/buy_order_ps')->getData(array('order_id' => $where['order_id']));
+                    $data = Dever::db('shop/buy_order')->getDataToId(array('parent_type' => $order['parent_type'], 'parent_order_id' => $order['parent_order_id']));
+
+                    $data = array_keys($data);
+                    
+
+                    $ps_info = Dever::db('shop/buy_order_ps')->getData(array('order_id' => $data));
 
                     if ($ps_info) {
                         $sell_order = array('id' => $order['parent_order_id']);

app/store/template/pc/order_send.php

@@ -7,7 +7,8 @@
 $view
 
 # 定义名称
-->fetch('#update_service_id', 'store/admin/order.getService') 
+->fetch('#update_service_c_service_id', 'store/admin/order.getService') 
+->fetch('#update_service_c_0_i_service_id', 'store/admin/order.getService') 
 ->fetch('.form1@action', 'store/admin/order.getConfig#send') 
 ->fetch('#update_where_id@value', '<{Dever::input("id")}>') 
 ->fetch('#update_cdate@value', '<{date("Y-m-d H:s")}>')