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

app/cash/lib/Set.php

@@ -45,7 +45,7 @@ class Set
         if ($type == 'store') {
             return $this->statDate($info['type'], $info['day']) . '与'.$other['name'].'对账单数量是否正确<br />对账数量' . $info['num'] . '个';
         }
-        return $this->statDate($info['type'], $info['day']) . '与'.$other['name'].'对账单款项是否正确<br />对账金额￥' . $info['cash'] . '元';
+        return $this->statDate($info['type'], $info['day']) . '与'.$other['name'].'对账单款项是否正确<br />对账金额￥' . round($info['cash'],2) . '元';
     }
 
     public function statTime($start, $end) 

service/bill/database/goods_stat.php

@@ -41,7 +41,7 @@ return array
             'search'    => 'sday',
             'search_buttons' => array
             (
-                'sum' => 'total_num,sell_num,cash',
+                'sum' => 'total_num,sell_num,cash,sell_nonum,price',
                 'option' => array(
                     'day' => '按天',
                     'week' => '按周',
@@ -50,7 +50,7 @@ return array
                 'group' => 'type,type_id,sku_id',
             ),
             'order'     => 'desc',
-            //'list'      => 'Dever::showDay("{day}")',
+            // 'list'      => 'Dever::showDay("{month}")',
         ),
 
         'type'        => array
@@ -215,7 +215,7 @@ return array
             'order' => array('day' => 'desc', 'cdate' => 'desc'),
             'page' => array(20, 'list'),
             'group' => '(case when type = 2 then concat_ws("_", type, type_id) else concat_ws("_", type, type_id, sku_id) end)',
-            'col' => '*,sum(total_num) as total_num, sum(sell_num) as sell_num, sum(cash) as cash',
+            'col' => '*,sum(total_num) as total_num, sum(sell_num) as sell_num, sum(cash) as cash,sum(sell_nonum) as sell_nonum,sum(price) as price',
         ),
 
         'all' => array

service/bill/database/member_stat.php

@@ -36,7 +36,7 @@ $config = array
             'search'    => 'day',
             'search_button' => array
             (
-                'sum' => 'num,city_num,county_num,town_num,ck_num,xk_num',
+                'sum' => 'num,city_num,county_num,town_num,ck_num,xk_num,cf_num,cv_num',
                 'option' => array(
                     'day' => '按天',
                     'week' => '按周',
@@ -183,7 +183,7 @@ $config = array
             'order' => array('time' => 'desc', 'cdate' => 'desc'),
             'page' => array(20, 'list'),
             'group' => 'day',//num,city_num,county_num,town_num,ck_num,xk_num
-            'col' => '*,min(day) as time, sum(num) as num, sum(city_num) as city_num, sum(county_num) as county_num, sum(town_num) as town_num, sum(ck_num) as ck_num, sum(xk_num) as xk_num',
+            'col' => '*,min(day) as time, sum(num) as num, sum(city_num) as city_num, sum(county_num) as county_num, sum(town_num) as town_num, sum(ck_num) as ck_num, sum(xk_num) as xk_num,sum(cf_num) as cf_num,sum(cv_num) as cv_num',
         ),
 
         'all' => array