dever vor 3 Jahren
Ursprung
Commit
e0ea2b9b81
4 geänderte Dateien mit 41 neuen und 4 gelöschten Zeilen
  1. 11 2
      app/shop/database/buy_order.php
  2. 12 2
      app/shop/database/sell_order.php
  3. 15 0
      app/shop/lib/Cron.php
  4. 3 0
      app/shop/lib/Refund.php

+ 11 - 2
app/shop/database/buy_order.php

@@ -280,6 +280,15 @@ $struct = array
         'list_order' => 6,
         'list_order' => 6,
     ),
     ),
 
 
+    'refund_num'        => array
+    (
+        'type'      => 'int-11',
+        'name'      => '退款数量',
+        'default'   => '',
+        'desc'      => '退款数量',
+        'match'     => 'is_numeric',
+    ),
+
     'refund_cash'      => array
     'refund_cash'      => array
     (
     (
         'type'      => 'varchar-50',
         'type'      => 'varchar-50',
@@ -813,7 +822,7 @@ $config = array
                 'state' => 1,
                 'state' => 1,
             ),
             ),
             'type' => 'one',
             'type' => 'one',
-            'col' => 'sum(num) as total',
+            'col' => 'sum(num-refund_num) as total',
         ),
         ),
 
 
         # 获取提交订单超过12个小时
         # 获取提交订单超过12个小时
@@ -843,7 +852,7 @@ $config = array
                 'state' => 1,
                 'state' => 1,
             ),
             ),
             'type' => 'one',
             'type' => 'one',
-            'col' => 'sum(num) as total',
+            'col' => 'sum(num-refund_num) as total',
         ),
         ),
 
 
         'getDataToId' => array
         'getDataToId' => array

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

@@ -350,6 +350,15 @@ return array
             'list_order'    => 10,
             'list_order'    => 10,
         ),
         ),
 
 
+        'refund_num'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '退款数量',
+            'default'   => '',
+            'desc'      => '退款数量',
+            'match'     => 'is_numeric',
+        ),
+
         'refund_cash'      => array
         'refund_cash'      => array
         (
         (
             'type'      => 'varchar-50',
             'type'      => 'varchar-50',
@@ -817,10 +826,11 @@ return array
             (
             (
                 'start' => array('yes-cdate', '>='),
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
                 'end' => array('yes-cdate', '<='),
+                'status' => array('yes', 'in'),
                 'state' => 1,
                 'state' => 1,
             ),
             ),
             'type' => 'all',
             'type' => 'all',
-            'col' => 'id,order_num,mobile,shop_id',
+            'col' => 'id,order_num,mobile,shop_id,cdate,sum(price-refund_cash) as total,sum(num-refund_num) as num',
         ),
         ),
 
 
         # 获取订单数量
         # 获取订单数量
@@ -868,7 +878,7 @@ return array
                 'state' => 1,
                 'state' => 1,
             ),
             ),
             'type' => 'one',
             'type' => 'one',
-            'col' => 'sum(num) as total',
+            'col' => 'sum(num-refund_num) as total',
         ),
         ),
 
 
         # 获取订单数量
         # 获取订单数量

+ 15 - 0
app/shop/lib/Cron.php

@@ -487,12 +487,27 @@ class Cron
 
 
         $w['start'] = $start;
         $w['start'] = $start;
         $w['end'] = $end;
         $w['end'] = $end;
+        $w['status'] = '2,3,4,5,6';
         $data = Dever::db('shop/sell_order')->getAllByDate($w);
         $data = Dever::db('shop/sell_order')->getAllByDate($w);
         print_r($data);die;
         print_r($data);die;
 
 
         if ($data) {
         if ($data) {
+            $where = array();
             foreach ($data as $k => $v) {
             foreach ($data as $k => $v) {
+                $day = Dever::maketime(date('Y-m-d 00:00:00', $v['cdate']));
+                $where['shop_id'] = $v['shop_id'];
+                $where['day'] = $day;
+                $where['clear'] = true;
+                $info = Dever::db('shop/shop_stat')->find($where);
 
 
+                if (!$info) {
+                    $up = $where;
+                    $up['num'] = $v['num'];
+                    $up['cash'] = $v['total'];
+                    Dever::db('shop/shop_stat')->insert($up);
+                } else {
+                    
+                }
             }
             }
         }
         }
 
 

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

@@ -168,6 +168,7 @@ class Refund
                     $num = $data['num'];
                     $num = $data['num'];
                 }
                 }
                 $cash = $data['price'] - $data['refund_cash'];
                 $cash = $data['price'] - $data['refund_cash'];
+                $num = $data['num'] - $data['refund_num'];
                 if (isset($data['p_price']) && isset($data['refund_p_cash'])) {
                 if (isset($data['p_price']) && isset($data['refund_p_cash'])) {
                     $p_cash = $data['p_price'] - $data['refund_p_cash'];
                     $p_cash = $data['p_price'] - $data['refund_p_cash'];
                 } else {
                 } else {
@@ -217,6 +218,7 @@ class Refund
                 $update = array();
                 $update = array();
                 $update['where_id'] = $data['id'];
                 $update['where_id'] = $data['id'];
                 $update['refund_cash'] = $data['refund_cash'] + $cash;
                 $update['refund_cash'] = $data['refund_cash'] + $cash;
+                $update['refund_num'] = $data['refund_num'] + $num;
                 if (isset($data['refund_p_cash'])) {
                 if (isset($data['refund_p_cash'])) {
                     $update['refund_p_cash'] = $data['refund_p_cash'] + $p_cash;
                     $update['refund_p_cash'] = $data['refund_p_cash'] + $p_cash;
                 }
                 }
@@ -270,6 +272,7 @@ class Refund
             if ($info['num'] && $info['num'] > 0) {
             if ($info['num'] && $info['num'] > 0) {
                 //$update['num'] = $order['num'] + $info['num'];
                 //$update['num'] = $order['num'] + $info['num'];
             }
             }
+            $update['refund_num'] = $order['refund_num'] - $info['num'];
             $update['refund_cash'] = $order['refund_cash'] - $info['cash'];
             $update['refund_cash'] = $order['refund_cash'] - $info['cash'];
             if (isset($order['refund_p_cash'])) {
             if (isset($order['refund_p_cash'])) {
                 $update['refund_p_cash'] = $order['refund_p_cash'] - $info['p_cash'];
                 $update['refund_p_cash'] = $order['refund_p_cash'] - $info['p_cash'];