1. 接口返回值修改

2. 接口返回数据过滤
3. 维修单相关接口调试

application/controllers/api/Galanz.php

@@ -39,17 +39,7 @@ class Galanz extends BaseController
 
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getCallOrder($values['out_trade_no'], $sourceGalanzObj);
-
-        //字段过滤
-        $fields = [
-            '__VIEWSTATE',
-//            'new_provinceid',
-//            'new_cityid',
-//            'new_countyid',
-//            'new_townid',
-//            'new_sentsiteid'
-        ];
-        $order = $this->diff($order, $fields);
+        $order = $this->diffCallOrder($order);
 
         $obj->ReturnMessage(true, '', $order);
     }
@@ -68,6 +58,7 @@ class Galanz extends BaseController
 
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
+        $order = $this->diffWorkOrder($order);
 
         $obj->ReturnMessage(true, '', $order);
     }
@@ -85,6 +76,7 @@ class Galanz extends BaseController
 
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getUserProfileOrder($values['mobile'], $values['up_order_no'], $sourceGalanzObj);
+        $order = $this->diffUserProfileOrder($order);
 
         $obj->ReturnMessage(true, '', $order);
     }
@@ -162,6 +154,7 @@ class Galanz extends BaseController
         $result = $sourceGalanzObj->CreateWorkOrder($order['new_id'], $order);
 
         if ($result) {
+            $result = $this->diffWorkOrder($result);
             $obj->ReturnMessage(true, '', $result);
         } else {
             $obj->ReturnMessage(false, '转录维修单失败');
@@ -187,7 +180,12 @@ class Galanz extends BaseController
         //保存订单
         $result = $sourceGalanzObj->CreateUserProfileOrder($order['new_id'], $order);
 
-        $obj->ReturnMessage(true, '', $result);
+        if ($result) {
+            $result = $this->diffUserProfileOrder($result);
+            $obj->ReturnMessage(true, '', $result);
+        } else {
+            $obj->ReturnMessage(false, '转录安装单失败');
+        }
     }
 
     public function saveUserProfileOrder()
@@ -246,6 +244,7 @@ class Galanz extends BaseController
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
         $order = $obj->SetSaveWorkOrderValues($order, $values);
         $result = $sourceGalanzObj->SaveWorkOrder($order['new_id'], $order);
+        $result = $this->diffWorkOrder($result);
 
         $obj->ReturnMessage(true, '', $result);
     }
@@ -265,6 +264,7 @@ class Galanz extends BaseController
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
         $result = $sourceGalanzObj->SendWorkOrder($order['new_id'], $order);
+        $result = $this->diffWorkOrder($result);
 
         $obj->ReturnMessage(true, '', $result);
     }
@@ -284,6 +284,7 @@ class Galanz extends BaseController
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
         $result = $sourceGalanzObj->ProdGetWorkOrder($order['new_id'], $order, $values['txtproducenumber']);
+        $result = $this->diffWorkOrder($result);
 
         $obj->ReturnMessage(true, '', $result);
     }
@@ -302,7 +303,9 @@ class Galanz extends BaseController
 
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
+        $order = $obj->SetAddErrorWorkOrderValues($order, $values);
         $result = $sourceGalanzObj->ErrorAddWorkOrder($order['new_id'], $order);
+        $result = $this->diffWorkOrder($result);
 
         $obj->ReturnMessage(true, '', $result);
     }
@@ -321,7 +324,9 @@ class Galanz extends BaseController
 
         $sourceGalanzObj = $this->sourceGalanzObj($values['account'], $values['pwd']);
         $order = $this->getWorkOrder($values['work_order_no'], $sourceGalanzObj);
+        $order = $obj->SetAddPartsWorkOrderValues($order, $values);
         $result = $sourceGalanzObj->PartsAddAddWorkOrder($order['new_id'], $order);
+        $result = $this->diffWorkOrder($result);
 
         $obj->ReturnMessage(true, '', $result);
     }
@@ -488,6 +493,41 @@ class Galanz extends BaseController
             return_msg(false, '查询的安装单不存在');
         }
 
+
+
+        return $order;
+    }
+
+    private function diffCallOrder($order)
+    {
+        //字段过滤
+        $fields = [
+            '__VIEWSTATE',
+        ];
+
+        $order = $this->diff($order, $fields);
+        return $order;
+    }
+
+    private function diffWorkOrder($order)
+    {
+        //字段过滤
+        $fields = [
+            '__VIEWSTATE',
+        ];
+
+        $order = $this->diff($order, $fields);
+        return $order;
+    }
+
+    private function diffUserProfileOrder($order)
+    {
+        //字段过滤
+        $fields = [
+            '__VIEWSTATE',
+        ];
+
+        $order = $this->diff($order, $fields);
         return $order;
     }
 

application/controllers/test/Rgalanz.php

@@ -85,7 +85,7 @@ class Rgalanz extends BaseController
         $data['appid'] = '10001';
         $data['account'] = self::$testu;
         $data['pwd'] = self::$testp;
-        $data['work_order_no'] = 'WO2016090703635';
+        $data['work_order_no'] = 'WO2016090802059';
 
         $data['nonce_str'] = $obj->GetNonceStr();
         $obj->SetValues($data);
@@ -130,7 +130,8 @@ class Rgalanz extends BaseController
         $data['appid'] = '10001';
         $data['account'] = self::$testu;
         $data['pwd'] = self::$testp;
-        $data['work_order_no'] = 'WO2016090703635';
+        $data['work_order_no'] = 'WO2016090802059';
+        $data['chk'] = '660a64fd-fad0-4de5-ac35-3cf03e078e48';
 
         $data['nonce_str'] = $obj->GetNonceStr();
         $obj->SetValues($data);
@@ -210,6 +211,29 @@ class Rgalanz extends BaseController
 
         $this->show($result['data']);
     }
+
+    public function addPartsWorkOrder()
+    {
+        $obj = $this->galanzObj();
+
+        $data['appid'] = '10001';
+        $data['account'] = self::$testu;
+        $data['pwd'] = self::$testp;
+        $data['work_order_no'] = 'WO2016090802059';
+        $data['chk'] = '8b4eb298-8863-4452-9cc3-fcbbfb4b4c1e';
+
+        $data['nonce_str'] = $obj->GetNonceStr();
+        $obj->SetValues($data);
+        $obj->SetSign();
+        $values = $obj->GetValues();
+
+        $url = self::$apiUrl . "api/galanz/addPartsWorkOrder";
+        $result = $this->curlPost($url, $values);
+
+        $result['data'] = json_decode($result['data'], true);
+
+        $this->show($result);
+    }
     
     public function saveWorkOrder()
     {
@@ -219,21 +243,21 @@ class Rgalanz extends BaseController
             'appid' => '10001',
             'account' => self::$testu,
             'pwd' => self::$testp,
-            'work_order_no' => 'WO2016090703635',
-            'custname' => '',
+            'work_order_no' => 'WO2016090802059',
+            'custname' => '何先生',
             'custmobile' => '',
-            'address' => '',
-            'broughtdate' => '',
-            'installdate' => '',
-            'visittime' => '',
-            'finishtime' => '',
+            'address' => urlencode('东莞市,南城街道办事处,大兴厨具1111'),
+            'broughtdate' => time(),
+            'installdate' => time(),
+            'visittime' => time(),
+            'finishtime' => time(),
             'repairapply' => '',
             'fault' => '',
             'parts' => '',
         ];
 
         $fault = [
-            'chk' => '35f18e11-013f-4e02-a760-26b718631de9',
+            'chk' => 'de1f6e4c-2947-41dc-91aa-a8b69b384186',
             'errormoduleid' => '1fcb2508-d161-e411-80cb-00155d016a1c',
             'errormoduleidName' => '不能制冷',
             'errorgroupid' => '2c27e484-924e-4168-a01e-3b7ca5a42241',
@@ -243,7 +267,7 @@ class Rgalanz extends BaseController
         ];
 
         $parts = [
-            'chk' => '58a88595-074f-4224-a681-b7f30266d7af',
+            'chk' => 'de1f6e4c-2947-41dc-91aa-a8b69b384186',
             'errorpartsid' => '6281df61-575b-46d2-b755-274a7840f75a',
             'errorpartsidName' => '1.5P变频松下压缩机\5RS102ZBE21 [R75/6.53/9.7/7.9kg]',
             'partsid' => '6281df61-575b-46d2-b755-274a7840f75a',
@@ -251,10 +275,8 @@ class Rgalanz extends BaseController
             'qty' => '1',
         ];
 
-        $data['fault'] = json_encode($fault);
-        $data['parts'] = json_encode($parts);
-
-        die($data['parts']);
+        $data['fault'] = urlencode(json_encode($fault));
+        $data['parts'] = urlencode(json_encode($parts));
 
         $data['nonce_str'] = $obj->GetNonceStr();
         $obj->SetValues($data);

application/controllers/test/Sgalanz.php

@@ -51,7 +51,7 @@ class Sgalanz extends BaseController
     public function searchWorkOrder()
     {
         $obj = $this->galanzObj();
-        $list = $obj->SearchWorkOrder('WO2016082204280');
+        $list = $obj->SearchWorkOrder('WO2016090802059');
         $this->show($list);
     }
 
@@ -73,7 +73,7 @@ class Sgalanz extends BaseController
     public function workOrderDetail()
     {
         $obj = $this->galanzObj();
-        $list = $obj->WorkOrderDetail('b4562475-1eac-415d-8713-653f8ea7d7c3');
+        $list = $obj->WorkOrderDetail('44e3a501-1a44-4d17-a9fc-d41bb2457a91');
         $this->show($list);
     }
 
@@ -118,8 +118,8 @@ class Sgalanz extends BaseController
 //        ];
 
         $account = [
-            'username' => 'R75510005',
-            'pwd' => 'dgqh!769'
+            'username' => 'K75516022',
+            'pwd' => '123456'
         ];
 
         $this->load->library('Source/SourceGalanz', $account, 'SourceGalanz');

application/helpers/base_helper.php

@@ -47,17 +47,15 @@ function str_aes($str, $key='', $type='en')
  * 接口返回值
  * @param bool $code
  * @param string $msg
- * @param array $data
+ * @param null $data
  */
-function return_msg($code= true, $msg = '', $data = [])
+function return_msg($code=true, $msg='', $data=null)
 {
 	$return['return_code'] = $code ? 'SUCCESS' : 'FAIL';
 	$return['return_msg'] = $code ? '成功' : $msg;
 
-	if ($data) {
-		if (!is_array($data)) {
-			$return['return_data'] = $data;
-		} else {
+	if (is_array($data)) {
+		if ($data) {
 			$flag = false;
 			foreach ($data as $k => $v) {
 				if (is_array($v)) {
@@ -71,7 +69,12 @@ function return_msg($code= true, $msg = '', $data = [])
 			} else {
 				$return = array_merge($return, $data);
 			}
+		} else {
+			$return['return_data'] = [];
 		}
+
+	} else {
+		$data && $return['return_data'] = $data;
 	}
 
 	echo json_encode($return, JSON_UNESCAPED_UNICODE);

application/libraries/Receive/Receive.php

@@ -166,43 +166,7 @@ class Receive
      */
     public function ReturnMessage($code= true, $msg = '', $data = [])
     {
-        echo $this->SetErrorCode($code, $msg, $data);
-        die();
-    }
-
-    /**
-     * 返回数据
-     * @param bool $code
-     * @param string $msg
-     * @param array $data
-     * @return string
-     */
-    public function SetErrorCode($code= true, $msg = '', $data = [])
-    {
-        $return['return_code'] = $code ? 'SUCCESS' : 'FAIL';
-        $return['return_msg'] = $code ? '成功' : $msg;
-
-        if ($data) {
-            if (!is_array($data)) {
-                $return['return_data'] = $data;
-            } else {
-                $flag = false;
-                foreach ($data as $k => $v) {
-                    if (is_array($v)) {
-                        $flag = true;
-                    }
-                    break;
-                }
-
-                if ($flag) {
-                    $return['return_data'] = $data;
-                } else {
-                    $return = array_merge($return, $data);
-                }
-            }
-        }
-
-        return json_encode($return, JSON_UNESCAPED_UNICODE);
+        return_msg($code, $msg, $data);
     }
 
 }
\ No newline at end of file

application/libraries/Receive/ReceiveGalanz.php

@@ -58,28 +58,28 @@ class ReceiveGalanz extends Receive
     public function SetSaveOrderValues($order, $values)
     {
         //处理参数
-        if ($values['sitecontacttime'] != '') {
+        if ($values['sitecontacttime']) {
             $order['new_sitecontacttime'] = $values['sitecontacttime'];
         }
-        if ($values['siteappointmenttime'] != '') {
+        if ($values['siteappointmenttime']) {
             $order['new_siteappointmenttime'] = $values['siteappointmenttime'];
         }
-        if ($values['actualvisittime'] != '') {
+        if ($values['actualvisittime']) {
             $order['new_actualvisittime'] = $values['actualvisittime'];
         }
-        if ($values['isguaranty'] != '') {
+        if ($values['isguaranty']) {
             $order['new_isguaranty'] = $values['isguaranty'] ? 'True' : 'False';
         }
-        if ($values['finishstatus'] != '') {
+        if ($values['finishstatus']) {
             $order['new_finishstatus'] = $values['finishstatus'] ? 'True' : 'False';
         }
-        if ($values['unfinishreason'] != '') {
+        if ($values['unfinishreason']) {
             $order['new_unfinishreason'] = $values['unfinishreason'];
         }
-        if ($values['sitedealremarks'] != '') {
+        if ($values['sitedealremarks']) {
             $order['new_sitedealremarks'] = $values['sitedealremarks'];
         }
-        if ($values['servicePersonnel'] != '') {
+        if ($values['servicePersonnel']) {
             $order['new_ServicePersonnel'] = $values['servicePersonnel'];
         }
 
@@ -146,44 +146,44 @@ class ReceiveGalanz extends Receive
     public function SetSaveWorkOrderValues($order, $values)
     {
         //处理基本信息参数
-        if ($values['custname'] != '') {
+        if ($values['custname']) {
             $order['new_custname'] = $values['custname'];
         }
-        if ($values['custmobile'] != '') {
+        if ($values['custmobile']) {
             $order['new_custmobile'] = $values['custmobile'];
         }
-        if ($values['address'] != '') {
+        if ($values['address']) {
             $order['new_address'] = $values['address'];
         }
-        if ($values['broughtdate'] != '') {
-            $order['new_broughtdate'] = $values['broughtdate'];
+        if ($values['broughtdate']) {
+            $order['new_broughtdate'] = date('Y/m/d', $values['broughtdate']);
         }
-        if ($values['installdate'] != '') {
-            $order['new_installdate'] = $values['installdate'];
+        if ($values['installdate']) {
+            $order['new_installdate'] = date('Y/m/d', $values['installdate']);
         }
-        if ($values['visittime'] != '') {
-            $order['new_visittime'] = $values['visittime'];
+        if ($values['visittime']) {
+            $order['new_visittime'] = date('Y/m/d H:i', $values['visittime']);
         }
-        if ($values['finishtime'] != '') {
-            $order['new_finishtime'] = $values['finishtime'];
+        if ($values['finishtime']) {
+            $order['new_finishtime'] = date('Y/m/d H:i', $values['finishtime']);
         }
-        if ($values['repairapply'] != '') {
+        if ($values['repairapply']) {
             $order['new_repairapply'] = $values['repairapply'];
         }
 
         //处理故障信息参数
-        if ($values['fault'] != '') {
+        if ($values['fault']) {
             $fault = json_decode($values['fault'], true);
 
             if (is_array($fault) && $fault && $order['fault']) {
                 foreach ($order['fault'] as $kk => $vv) {
                     if ($fault['chk'] == $vv['chk']) {
-                        isset($fault['errormoduleid']) && $vv['new_errormoduleid'] = $fault['errormoduleid'];
-                        isset($fault['errormoduleidName']) && $vv['new_errormoduleidName'] = $fault['errormoduleidName'];
-                        isset($fault['errorgroupid']) && $vv['new_errorgroupid'] = $fault['errorgroupid'];
-                        isset($fault['errorgroupidName']) && $vv['new_errorgroupidName'] = $fault['errorgroupidName'];
-                        isset($fault['errorsolutionid']) && $vv['new_srv_errorsolutionid'] = $fault['errorsolutionid'];
-                        isset($fault['errorsolutionidName']) && $vv['new_srv_errorsolutionidName'] = $fault['errorsolutionidName'];
+                        isset($fault['errormoduleid']) && $vv['new_errormoduleid'] = urldecode($fault['errormoduleid']);
+                        isset($fault['errormoduleidName']) && $vv['new_errormoduleidName'] = urldecode($fault['errormoduleidName']);
+                        isset($fault['errorgroupid']) && $vv['new_errorgroupid'] = urldecode($fault['errorgroupid']);
+                        isset($fault['errorgroupidName']) && $vv['new_errorgroupidName'] = urldecode($fault['errorgroupidName']);
+                        isset($fault['errorsolutionid']) && $vv['new_srv_errorsolutionid'] = urldecode($fault['errorsolutionid']);
+                        isset($fault['errorsolutionidName']) && $vv['new_srv_errorsolutionidName'] = urldecode($fault['errorsolutionidName']);
 
                         $order['fault'][$kk] = $vv;
                     }
@@ -192,17 +192,17 @@ class ReceiveGalanz extends Receive
         }
 
         //处理配件信息参数
-        if ($values['parts'] != '') {
+        if ($values['parts']) {
             $parts = json_decode($values['parts'], true);
 
             if (is_array($parts) && $parts && $order['parts']) {
                 foreach ($order['parts'] as $kk => $vv) {
                     if ($parts['chk'] == $vv['chk']) {
-                        isset($parts['errorpartsid']) && $vv['new_errorpartsid'] = $parts['errorpartsid'];
-                        isset($parts['errorpartsidName']) && $vv['new_errorpartsidName'] = $parts['errorpartsidName'];
-                        isset($parts['partsid']) && $vv['new_partsid'] = $parts['partsid'];
-                        isset($parts['partsidName']) && $vv['new_partsidName'] = $parts['partsidName'];
-                        isset($parts['qty']) && $vv['new_qty'] = $parts['qty'];
+                        isset($parts['errorpartsid']) && $vv['new_errorpartsid'] = urldecode($parts['errorpartsid']);
+                        isset($parts['errorpartsidName']) && $vv['new_errorpartsidName'] = urldecode($parts['errorpartsidName']);
+                        isset($parts['partsid']) && $vv['new_partsid'] = urldecode($parts['partsid']);
+                        isset($parts['partsidName']) && $vv['new_partsidName'] = urldecode($parts['partsidName']);
+                        isset($parts['qty']) && $vv['new_qty'] = $parts['qty'] + 1;
 
                         $order['parts'][$kk] = $vv;
                     }
@@ -239,16 +239,43 @@ class ReceiveGalanz extends Receive
 
     public function CheckAddErrorWorkOrderValues()
     {
-        $fileds = ['work_order_no'];
+        $fileds = ['work_order_no', 'chk'];
         $this->CheckValues($fileds);
     }
 
+    public function SetAddErrorWorkOrderValues($order, $values)
+    {
+        if ($values['chk'] && $order['machine']) {
+            foreach ($order['machine'] as $kk => $vv) {
+                if ($values['chk'] == $vv['chk']) {
+                    $vv['cbiserror'] = 1;
+                    $order['machine'][$kk] = $vv;
+                }
+            }
+        }
+
+        return $order;
+    }
+
     public function CheckAddPartsWorkOrderValues()
     {
-        $fileds = ['work_order_no'];
+        $fileds = ['work_order_no', 'chk'];
         $this->CheckValues($fileds);
     }
 
+    public function SetAddPartsWorkOrderValues($order, $values)
+    {
+        if ($values['chk'] && $order['fault']) {
+            foreach ($order['fault'] as $kk => $vv) {
+                if ($values['chk'] == $vv['chk']) {
+                    $order['fault'][$kk]['checked'] = 1;
+                }
+            }
+        }
+
+        return $order;
+    }
+
     public function CheckLookupErrormModuleValues()
     {
         $fileds = ['workorderproductid'];
@@ -309,6 +336,8 @@ class ReceiveGalanz extends Receive
             foreach ($fields as $v) {
                 if (!array_key_exists($v, $this->values) || $this->values[$v] == '') {
                     $this->ReturnMessage(false, "{$v}参数错误!");
+                } else {
+                    $this->values[$v] = urldecode($this->values[$v]);
                 }
             }
         }
@@ -323,7 +352,9 @@ class ReceiveGalanz extends Receive
         if ($fields) {
             foreach ($fields as $v) {
                 if (!array_key_exists($v, $this->values)) {
-                    $this->values[$v] == '';
+                    $this->values[$v] = '';
+                } else {
+                    $this->values[$v] = urldecode($this->values[$v]);
                 }
             }
         }

application/libraries/Source/SourceGalanz.php

@@ -1069,6 +1069,8 @@ class SourceGalanz extends Source
         $parts = $this->HandelWorkOrderPartsParam($data['parts']);
         $post = array_merge($post, $parts);
 
+        //return_msg(true, '', $post);
+
         $url = self::$host . '/repair/new_srv_workorderEP.aspx?mainid=&mainidname=&attrcode=&id=' . $id;
         $headers = $this->Header($url);
         $result = $this->CurlPost($url, $post, $headers);
@@ -1131,6 +1133,10 @@ class SourceGalanz extends Source
                     'ctl00$ContentData$rptError$ctl'.$tempKey.'$file_imgaft' => '',
                 ];
 
+                if (!isset($v['checked']) || !$v['checked']) {
+                    array_shift($post);
+                }
+
                 $result = array_merge($result, $post);
             }
         }