Merge branch 'master' into release

application/em/controller/Em.php

@@ -167,7 +167,7 @@ class Em extends Base
         }
 
         //组装信息
-        if(isset($data['em_id']))
+        if(isset($data['em_id']) && $data['em_id'] != '')
             return $this->updateAll($data);
         else
             return $this->storeAll($data);
@@ -183,15 +183,19 @@ class Em extends Base
         //保存电表数据
         $emModel = new \app\em\model\Em();
         if($emModel->save($data)){
-            $data['em_id'] = $emModel->id;
+            $data['em_id'] =  $emModel->id;
+            //保存缴费结算数据
+            $emRuleModel = new EmRule();
+            if($emRuleModel->save($data)){
+                (new Account())->createAccount($emRuleModel->em_id);
+                return json(['status'=>1,'message'=>'添加电表成功']);
+            } else {
+                $emModel->delete();
+                return json(['status'=>0,'message'=>'添加电表失败,请检查缴费与结算信息是否合规填写']);
+            }
+        } else {
+            return json(['status'=>0,'message'=>'添加电表失败,系统异常,请联系产品研发部']);
         }
-
-        //保存缴费结算数据
-        $emRuleModel = new EmRule();
-        $emRuleModel->save($data);
-
-        (new Account())->createAccount($data['em_id']);
-        return json(['status'=>1,'message'=>'添加电表成功']);
     }
 
     //更新写入数据