格兰仕 - 保存维修单 - 拉修费

application/controllers/test/Galanz.php

@@ -42,9 +42,10 @@ class Galanz extends BaseController
             8 => ['u' => 'R75510005', 'p' => 'dgqh!769'],
             9 => ['u' => 'W75509335', 'p' => 'szwxh!755'],
             10 => ['u' => 'W02029017', 'p' => 'weixiuhui09'],
+            11 => ['u' => 'R75500046', 'p' => 'szwxh!755'],
         ];
 
-        $key = 10;
+        $key = 11;
         self::$testu = $account[$key]['u'];
         self::$testp = $account[$key]['p'];
         //self::$testp = urlencode(str_aes($account[5]['p']));
@@ -232,7 +233,7 @@ class Galanz extends BaseController
         $data['appid'] = '10001';
         $data['account'] = self::$testu;
         $data['pwd'] = self::$testp;
-        $data['id'] = '5eb38919-86d0-4e31-83ee-c35f761f9257';
+        $data['id'] = 'ddea2315-f4ec-410f-9e4a-2f1d752d5852';
 
         $data['nonce_str'] = $obj->GetNonceStr();
         $obj->SetValues($data);
@@ -630,7 +631,7 @@ class Galanz extends BaseController
             'appid' => '10001',
             'account' => self::$testu,
             'pwd' => self::$testp,
-            'id' => '5eb38919-86d0-4e31-83ee-c35f761f9257',
+            'id' => 'ddea2315-f4ec-410f-9e4a-2f1d752d5852',
             'custname' => '',
             'custmobile' => '',
             'address' => '',
@@ -646,6 +647,7 @@ class Galanz extends BaseController
             'isremote' => '', //是否远程
             'scope' => '2', //上门范围
             'distancekm' => '', //上门距离
+            'laxiuamount' => 50
         ];
 
 //        $machine = [

application/libraries/Receive/ReceiveGalanz.php

@@ -214,6 +214,7 @@ class ReceiveGalanz extends Receive
             'scope', //上门范围
             'distancekm', //上门距离
             'repairapply', //维修人员
+            'laxiuamount', //拉修费
             'machine', //机器信息
             'fault', //故障信息
             'parts', //换件信息
@@ -264,7 +265,10 @@ class ReceiveGalanz extends Receive
             $order['new_scope'] = in_array($values['scope'], [1,2,3]) ? $values['scope'] : '';
         }
         if ($values['distancekm']) {
-            $order['new_distancekm'] = $values['distancekm'];
+            $order['new_distancekm'] = $values['distancekm'] + 0;
+        }
+        if ($values['laxiuamount']) {
+            $order['new_laxiuamount'] = $values['laxiuamount'] + 0;
         }
 
         //处理机器信息参数

application/libraries/Source/SourceGalanz.php

@@ -658,6 +658,7 @@ class SourceGalanz extends Source
         $order['new_distancekm'] = bcadd($order['new_distancekm'], 0, 2);
         $order['new_baseamount'] = bcadd($order['new_baseamount'], 0, 2);
         $order['new_mileamount'] = bcadd($order['new_mileamount'], 0, 2);
+        $order['new_laxiuamount'] = bcadd($order['new_laxiuamount'], 0, 2);
 
         return $order;
     }

docs/galanz.md

@@ -556,6 +556,7 @@ new_id | id | 是 | String(32) | 2ac18853-8f45-4210-8e98-e4bb0d3554a9 | 维修
 是否远程 | isremote | 否 | String(32) |  | 1:是; 0:否
 上门范围 | scope | 否 | String(32) | | 1:市区; 2:市郊; 3:市外
 上门距离 | distancekm | 否 | String(32) | 100
+拉修费 | laxiuamount | 否 | String(32) | 50
 机器信息 | machine | 否 | Json | {"chk":"machine下chk","producttypeid":"new_producttypeid","producttypeidName":"new_producttypeidName","productmodelid":"new_productmodelid","productmodelidName":"new_name","productnumber":"productnumber","modelnumber":"name"} | 添加机器,保存需要填写该字段,其他非必填
 故障信息 | fault | 否 | Json | {"chk":"新增的故障chk","errormoduleid":"","errormoduleidName":"故障现象","errorgroupid":"","errorgroupidName":"原因分类","errorsolutionid":"","errorsolutionidName":"维修措施"} | 添加故障,保存需要填写该字段,其他非必填
 换件信息 | parts | 否 | Json | {"chk":"新增的配件chk","errorpartsid":"","errorpartsidName":"不良品名称","partsid":"","partsidName":"良品名称","qty":"库存"} | 添加换件,保存需要填写该字段,其他非必填