Merge branch 'master' of http://114.215.101.231:8099/lihan/integral into lilijuan

@@ -78,8 +78,10 @@ class ZjOrderController extends AdminBaseController
         $whole = 0;
         $whole = 0;
         $whole_num = 0;
         $whole_num = 0;
         foreach ($all as $item) {
         foreach ($all as $item) {
-            $whole+=$item['whole'];
-            $whole_num+=$item['whole_num'];
+            if($item['step'] > 1) {
+                $whole += $item['whole'];
+                $whole_num += $item['whole_num'];
+            }
         }
         }
         $total = $whole - $whole_num;
         $total = $whole - $whole_num;
         $this->assign('start_time', !empty($arr['start_time']) ? $arr['start_time'] : '');
         $this->assign('start_time', !empty($arr['start_time']) ? $arr['start_time'] : '');