fix bug

Application/Admin/Controller/GroupOrderController.class.php

@@ -269,7 +269,7 @@ class GroupOrderController extends AdminController
                 ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
                 ->join('yi_goods on yi_order_goods.goods_id=yi_goods.id')
                 ->join('yi_goods_group gg on yi_goods.id=gg.goods_id and gg.group_id='.$this->group_id)
                 ->join('yi_goods_group gg on yi_goods.id=gg.goods_id and gg.group_id='.$this->group_id)
                 ->select();
                 ->select();
-            $order_info[$key]['o_status']=$goods_info[0]['status'];
+            $order_info[$key]['o_status']=$v['status'] == 2 ? '-1' : $goods_info[0]['status'];
             $order_info[$key]['goods']=$goods_info;
             $order_info[$key]['goods']=$goods_info;
             $order_info[$key]['s_price']=0;
             $order_info[$key]['s_price']=0;
             foreach($goods_info as $v1){
             foreach($goods_info as $v1){
@@ -360,7 +360,7 @@ class GroupOrderController extends AdminController
                 $paymoney = $rows['s_price']+$rows['dis_price'];
                 $paymoney = $rows['s_price']+$rows['dis_price'];
                 $rows['s_price']=number_format($paymoney,2);//转换为2位数的钱
                 $rows['s_price']=number_format($paymoney,2);//转换为2位数的钱
                 $rows['ssZw']=number2chinese($paymoney);
                 $rows['ssZw']=number2chinese($paymoney);
-                $rows['status1']=$goods_list[0]['status'];
+                $rows['status1']=$rows['status'] == 2 ? '-1' : $goods_list[0]['status'];
                 $rows['list']=$goods_list;
                 $rows['list']=$goods_list;
                 $log=$this->getLogistics($rows['order_num'],$this->group_id);
                 $log=$this->getLogistics($rows['order_num'],$this->group_id);
                 $rows['log']=$log;
                 $rows['log']=$log;
@@ -580,7 +580,8 @@ class GroupOrderController extends AdminController
             $paymoney = $rows['s_price']+$rows['dis_price'];
             $paymoney = $rows['s_price']+$rows['dis_price'];
             $rows['s_price']=number_format($paymoney,2);//转换为2位数的钱
             $rows['s_price']=number_format($paymoney,2);//转换为2位数的钱
             $rows['ssZw']=number2chinese($paymoney);
             $rows['ssZw']=number2chinese($paymoney);
-            $rows['status1']=$goods_list[0]['status'];
+//            $rows['status1']=$goods_list[0]['status'];
+            $rows['status1']=$rows['status'] == 2 ? '-1' : $goods_list[0]['status'];
             $rows['list']=$goods_list;
             $rows['list']=$goods_list;
             $log=$this->getLogistics($rows['order_num'],$this->group_id);
             $log=$this->getLogistics($rows['order_num'],$this->group_id);
             $rows['log']=$log;
             $rows['log']=$log;

Application/Admin/Controller/GroupStatiController.class.php

@@ -94,6 +94,7 @@ FROM yi_order as o
                            og.order_id,
                            og.order_id,
                            og.group_id
                            og.group_id
                     FROM yi_order_goods as og
                     FROM yi_order_goods as og
+                    WHERE og.status > 0
                     GROUP BY og.order_id) as a
                     GROUP BY og.order_id) as a
                    on a.order_id = o.id
                    on a.order_id = o.id
 WHERE a.group_id = {$this->group_id}
 WHERE a.group_id = {$this->group_id}

Application/Admin/Controller/OtherController.class.php

@@ -64,10 +64,12 @@ class OtherController extends AdminController
                 $pid = $areaParent['id'];
                 $pid = $areaParent['id'];
                 $dArea = $area->where(['pid' => $pid])->select();
                 $dArea = $area->where(['pid' => $pid])->select();
             }
             }
+            $meta_title = ($cid > 0 ? '编辑' : '添加') . '开通城市';
+
             $this->assign('cid', $cid);
             $this->assign('cid', $cid);
             $this->assign('pid', $pid);
             $this->assign('pid', $pid);
             $this->assign('dredge', $dredge);
             $this->assign('dredge', $dredge);
-            $this->assign('meta_title','添加城市');
+            $this->assign('meta_title',$meta_title);
             $this->assign('province',$list);
             $this->assign('province',$list);
             $this->assign('dArea',$dArea);
             $this->assign('dArea',$dArea);
             $this->display();
             $this->display();

Application/Admin/View/groupOrder/details.html

@@ -50,6 +50,7 @@
                          <eq name="rows.status1" value="2">待发货</eq>
                          <eq name="rows.status1" value="2">待发货</eq>
                          <eq name="rows.status1" value="3">待收货</eq>
                          <eq name="rows.status1" value="3">待收货</eq>
                          <eq name="rows.status1" value="4">交易完成</eq>
                          <eq name="rows.status1" value="4">交易完成</eq>
+                         <eq name="rows.status1" value="-1">已取消</eq>
                      </span>
                      </span>
                      <span style="color: red;">
                      <span style="color: red;">
                          订单总价：￥{$rows.s_price}元
                          订单总价：￥{$rows.s_price}元

Application/Admin/View/groupOrder/index5.html

@@ -72,6 +72,7 @@
                             <eq name="vo.o_status" value="2">待发货</eq>
                             <eq name="vo.o_status" value="2">待发货</eq>
                             <eq name="vo.o_status" value="3">待收货</eq>
                             <eq name="vo.o_status" value="3">待收货</eq>
                             <eq name="vo.o_status" value="4">已完成</eq>
                             <eq name="vo.o_status" value="4">已完成</eq>
+                            <eq name="vo.o_status" value="-1">已取消</eq>
                         </td>
                         </td>
 
 
                         <td>  <a href="{:U('GroupOrder/details?id='.$vo['id'])}" class="" >订单详情</a></td>
                         <td>  <a href="{:U('GroupOrder/details?id='.$vo['id'])}" class="" >订单详情</a></td>
@@ -251,4 +252,4 @@
             }
             }
         }
         }
     </script>
     </script>
-</block>
+</block>
\ No newline at end of file

Application/Admin/View/other/dredgeAdd.html

@@ -2,7 +2,7 @@
 
 
 <block name="body">
 <block name="body">
     <div class="main-title">
     <div class="main-title">
-        <h2>添加开通城市</h2>
+        <h2>{$meta_title}</h2>
     </div>
     </div>
     <form action="__SELF__" method="post" class="form-horizontal" onsubmit="return hid()">
     <form action="__SELF__" method="post" class="form-horizontal" onsubmit="return hid()">
         <input type="hidden" name="city_name" value="" id="city_name" />
         <input type="hidden" name="city_name" value="" id="city_name" />

Application/Home/Controller/ApiIndentController.class.php

@@ -391,8 +391,8 @@ class ApiIndentController extends Controller
 
 
         $_data['y_price']=($priceS['y_price'] + $cexplain);//商品总优惠价格
         $_data['y_price']=($priceS['y_price'] + $cexplain);//商品总优惠价格
 //        $_data['s_price']=$_data['z_price']+$_data['dis_price']-$_data['cou_price']-$_data['y_price'];//订单最终价格
 //        $_data['s_price']=$_data['z_price']+$_data['dis_price']-$_data['cou_price']-$_data['y_price'];//订单最终价格
-        $_data['s_price']=$_data['z_price']+$_POST['dis_price']-$_data['cou_price']-$_data['y_price'];//订单最终价格
-//        $_data['s_price'] = 0.01;
+//        $_data['s_price']=$_data['z_price']+$_POST['dis_price']-$_data['cou_price']-$_data['y_price'];//订单最终价格
+        $_data['s_price'] = 0.01;
         $order=M('order');//添加订单数据
         $order=M('order');//添加订单数据
         $order->startTrans();//开启事务
         $order->startTrans();//开启事务
         $msg=$order->data($_data)->add();
         $msg=$order->data($_data)->add();

Application/Home/Controller/ApiOrderController.class.php

@@ -95,7 +95,7 @@ class ApiOrderController extends Controller
             }
             }
             echo json2(200,'success',$info);
             echo json2(200,'success',$info);
         }else{
         }else{
-            echo json2(400,'暂无数据！','error');
+            echo json2(200,'暂无数据！',[]);
         }
         }
     }
     }
     //取消订单
     //取消订单
@@ -105,6 +105,11 @@ class ApiOrderController extends Controller
         $order=M('order');
         $order=M('order');
         $data['status']=2;
         $data['status']=2;
         $msg=$order->where('order_num="'.$_GET['order_num'].'"')->data($data)->save();
         $msg=$order->where('order_num="'.$_GET['order_num'].'"')->data($data)->save();
+        $orderModel = M('order')->where('order_num="'.$_GET['order_num'].'"')->find();
+        $orderGoods = M('order_goods')->where('order_id = ' . $orderModel['id'])->data([
+            'status' => -1
+        ])->save();
+
         if($msg){
         if($msg){
             echo json2(200,'操作成功！','success');
             echo json2(200,'操作成功！','success');
         }else{
         }else{

ThinkPHP/Library/Org/Util/PHPExcel/Calculation/Functions.php

@@ -578,7 +578,7 @@ class PHPExcel_Calculation_Functions {
 				return 4;
 				return 4;
 		} elseif(is_array($value)) {
 		} elseif(is_array($value)) {
 				return 64;
 				return 64;
-				break;
+//				break;
 		} elseif(is_string($value)) {
 		} elseif(is_string($value)) {
 			//	Errors
 			//	Errors
 			if ((strlen($value) > 0) && ($value{0} == '#')) {
 			if ((strlen($value) > 0) && ($value{0} == '#')) {