Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/shop/lib/Money.php

@@ -83,13 +83,13 @@ class Money
         $cash = $send['pay_cash'];
         $msg = $send['pay_msg'];
         if ($status == 2) {
-            $this->up($product_id, 1, $cash, $send['pay_id'], '充值', 2);
+            $this->up($product_id, 1, $cash, $send['pay_id'], '充值', 2,$order_id);
         }
 
         return 'ok';
     }
 
-    public function up($uid, $type, $cash, $type_id, $desc, $status)
+    public function up($uid, $type, $cash, $type_id, $desc, $status,$order_id)
     {
         if ($cash == 0) {
             return false;
@@ -106,7 +106,8 @@ class Money
         	$info = Dever::db('shop/user_money')->find($where);
         	if (!$info) {
         		$data = $where;
-        		$data['order_num'] = $this->getOrderId();
+        		$data['order_num'] = $order_id;
+                // $this->getOrderId();
         		$data['yue'] = $user['cash'] + $cash;
         		$data['cash'] = $cash;
         		$data['desc'] = $desc;