dever 3 år sedan
förälder
incheckning
1faf890eaa

+ 2 - 0
app/factory/lib/Order.php

@@ -78,6 +78,8 @@ class Order
         $order_data['status'] = 3;
 
         $order_data['order_num'] = $this->getOrderId();
+        $order_data['refund_cash'] = 0;
+        $order_data['refund_p_cash'] = 0;
         $id = Dever::db('shop/buy_order')->insert($order_data);
 
         if (!$id) {

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

@@ -259,6 +259,8 @@ class Buy
         $order_data['price'] = $price;
 
         $order_data['order_num'] = $this->getOrderId();
+        $order_data['refund_cash'] = 0;
+        $order_data['refund_p_cash'] = 0;
         $id = Dever::db('shop/buy_order')->insert($order_data);
 
         if (!$id) {
@@ -1268,6 +1270,8 @@ class Buy
             $data['price'] = $price * $num;
             $data['p_price'] = $p_price * $num;
             $data['num'] = $num;
+            $data['refund_cash'] = 0;
+            $data['refund_p_cash'] = 0;
             $id = $state = Dever::db('shop/buy_order')->insert($data);
         } else {
             $id = $info['id'];

+ 1 - 1
app/shop/database/buy_order_goods.php

@@ -72,7 +72,7 @@ return array
         (
             'type'      => 'varchar-50',
             'name'      => '单价',
-            'default'   => '',
+            'default'   => '0',
             'desc'      => '单价',
             'match'     => 'option',
             'update'    => 'text',

+ 1 - 1
app/shop/database/buy_order_ps.php

@@ -131,7 +131,7 @@ return array
         (
             'type'      => 'varchar-50',
             'name'      => '快递费用',
-            'default'   => '',
+            'default'   => '0',
             'desc'      => '快递费用',
             'match'     => 'option',
             'update'    => 'text',

+ 1 - 1
app/shop/database/out_order_goods.php

@@ -61,7 +61,7 @@ return array
         (
             'type'      => 'varchar-50',
             'name'      => '单价',
-            'default'   => '',
+            'default'   => '0',
             'desc'      => '单价',
             'match'     => 'option',
             'update'    => 'text',

+ 2 - 2
app/shop/database/sell_order.php

@@ -173,7 +173,7 @@ return array
         (
             'type'      => 'varchar-50',
             'name'      => '支付金额',
-            'default'   => '',
+            'default'   => '0',
             'desc'      => '支付金额',
             'match'     => 'option',
             'update'    => 'text',
@@ -216,7 +216,7 @@ return array
         (
             'type'      => 'varchar-50',
             'name'      => '抹零金额',
-            'default'   => '',
+            'default'   => '0',
             'desc'      => '抹零金额',
             'match'     => 'option',
             'update'    => 'text',

+ 14 - 6
app/shop/lib/Cron.php

@@ -85,9 +85,11 @@ class Cron
                 $data['shop_id'] = $v['id'];
                 $data['day'] = $where['start'];
                 $info = Dever::db('shop/sell_stat')->find($data);
-                $data['cash'] = Dever::db('shop/sell_order')->getCashNum($where);
+                $cash = Dever::db('shop/sell_order')->getCashNum($where);
+                $data['cash'] = $cash['total'];
                 $data['order'] = Dever::db('shop/sell_order')->getOrderNum($where);
-                $data['goods'] = Dever::db('shop/sell_order')->getGoodsNum($where);
+                $goods = Dever::db('shop/sell_order')->getGoodsNum($where);
+                $data['goods'] = $goods['total'];
                 $data['area'] = $v['area'];
                 $data['province'] = $v['province'];
                 $data['city'] = $v['city'];
@@ -120,16 +122,22 @@ class Cron
             $where['shop_id'] = $v['id'];
             for($i=0; $i<=$day; $i++) {
                 $where['start'] = $start + 86400*$i;
-                $where['end'] = $start + 86400*$i + 86399;
+                //$where['end'] = $start + 86400*$i + 86399;
                 $data = array();
                 $data['type'] = 1;
                 $data['type_id'] = $v['id'];
                 $data['day'] = $where['start'];
                 $info = Dever::db('shop/buy_stat')->find($data);
-                $data['cash'] = Dever::db('shop/buy_order')->getCashNum($where);
-                $data['p_cash'] = Dever::db('shop/buy_order')->getPCashNum($where);
+                $cash = Dever::db('shop/buy_order')->getCashNum($where);
+                $data['cash'] = $cash['total'];
+                $cash = Dever::db('shop/buy_order')->getPCashNum($where);
+                $data['p_cash'] = $cash['total'];
+
                 $data['order'] = Dever::db('shop/buy_order')->getOrderNum($where);
-                $data['goods'] = Dever::db('shop/buy_order')->getGoodsNum($where);
+                $goods = Dever::db('shop/buy_order')->getGoodsNum($where);
+
+                $data['goods'] = $goods['total'];
+
                 $data['area'] = $v['area'];
                 $data['province'] = $v['province'];
                 $data['city'] = $v['city'];

+ 1 - 0
app/shop/lib/Sell.php

@@ -636,6 +636,7 @@ class Sell
         $order_data['method'] = $method;
         $order_data['pay_method'] = $pay_method;
         $order_data['pay_type'] = $pay_type;
+        $order_data['refund_cash'] = 0;
 
         if ($card) {
         	$order_data['card_code_id'] = $card['id'];