dever 3 years ago
parent
commit
a1abd40eef
3 changed files with 5 additions and 4 deletions
  1. 1 1
      app/cash/lib/Order.php
  2. 1 0
      app/mshop/lib/Buy.php
  3. 3 3
      app/shop/lib/Refund.php

+ 1 - 1
app/cash/lib/Order.php

@@ -60,7 +60,7 @@ class Order
 
             if ($refund) {
                 $update['cash'] = $refund['cash'];
-                $update['p_cash'] = $refund['p_cash'];
+                $update['p_cash'] = isset($refund['p_cash']) ? $refund['p_cash'] : 0;
             } else {
                 $update['cash'] = $order['price'];
                 $update['p_cash'] = $order['p_price'];

+ 1 - 0
app/mshop/lib/Buy.php

@@ -737,6 +737,7 @@ class Buy
                 $info['ps_info']['service_name'] = $service['name'];
             }
 
+            $info['ps_info']['order_num'] = str_replace("\r\n", ',', $info['ps_info']['order_num']);
             if ($type == 3) {
                 $head = array('名称', '单号', '数量', '重量', '体积', '发货时间', '收货时间');
 

+ 3 - 3
app/shop/lib/Refund.php

@@ -70,7 +70,7 @@ class Refund
 
         $data['status'] = $status;
         $data['cash'] = $price;
-        if ($p_price && $p_price > 0) {
+        if ($p_price) {
             $data['p_cash'] = $p_price;
         }
         
@@ -192,7 +192,7 @@ class Refund
                 $update['where_id'] = $data['id'];
                 $update['refund_cash'] = $data['refund_cash'] + $cash;
                 if (isset($data['refund_p_cash'])) {
-                    $update['refund_p_cash'] = $data['refund_p_cash'] + $cash;
+                    $update['refund_p_cash'] = $data['refund_p_cash'] + $p_cash;
                 }
                 $update['refund_status'] = 2;
                 if ($dec > 0) {
@@ -309,7 +309,7 @@ class Refund
             Dever::load('shop/lib/goods')->oper($order, 1, 1, $data);
         }
 
-        return 'ok';
+        return 'reload';
     }
 
     # 获取部分退款的详情