rabin 2 년 전
부모
커밋
86e68ffeb6
1개의 변경된 파일24개의 추가작업 그리고 12개의 파일을 삭제
  1. 24 12
      app/cash/lib/Order.php

+ 24 - 12
app/cash/lib/Order.php

@@ -54,21 +54,33 @@ class Order
             $update['source_id'] = $order['source_id'];
             $update['source_id'] = $order['source_id'];
         }
         }
 
 
-        $update['source_order_num'] = $order['order_num'];
+        if ($info && $jstype == 3) {
-        $update['num'] = $order['num'];
 
 
-        if ($refund) {
-            $update['cash'] = $refund['cash'];
-            $update['p_cash'] = isset($refund['p_cash']) ? $refund['p_cash'] : 0;
         } else {
         } else {
-            $update['cash'] = $order['price'];
+            
-            $update['p_cash'] = $order['p_price'];
+            $update['type'] = $order['type'];
-        }
+            $update['type_id'] = $order['type_id'];
+            if ($order['source_type']) {
+                $update['source_type'] = $order['source_type'];
+                $update['source_id'] = $order['source_id'];
+            }
 
 
-        if ($jstype == 2) {
+            $update['source_order_num'] = $order['order_num'];
-            $update['cash'] = -1*$update['cash'];
+            $update['num'] = $order['num'];
-            $update['p_cash'] = -1*$update['p_cash'];
+
-            $update['num'] = -1*$update['num'];
+            if ($refund) {
+                $update['cash'] = $refund['cash'];
+                $update['p_cash'] = isset($refund['p_cash']) ? $refund['p_cash'] : 0;
+            } else {
+                $update['cash'] = $order['price'];
+                $update['p_cash'] = $order['p_price'];
+            }
+
+            if ($jstype == 2) {
+                $update['cash'] = -1*$update['cash'];
+                $update['p_cash'] = -1*$update['p_cash'];
+                $update['num'] = -1*$update['num'];
+            }
         }
         }
 
 
         if ($info) {
         if ($info) {