Merge branch 'dev' into dev-sxb

app/controller/api/Auth.php

@@ -519,7 +519,7 @@ class Auth extends BaseController
             }
         }
         // Log::info($data);
-        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,0);
+        $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
         // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);
@@ -543,22 +543,22 @@ class Auth extends BaseController
 //                }
 //            }
 //        }
-//        if ($type == "marketing"){
-//            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
-//            $spread_list = explode(',',$spread['spread_list']);
-//            if (!empty($spread_list)){
-//                $spread_list[] = "[" . $spread['uid'] . "]";
-//            }else{
-//                array_push($spread_list,"[".$spread['uid']."]");
-//            }
-//            $spread_list = array_filter($spread_list);
-//                    $data = [
-//                "uid" => $user->uid,
-//                "spread_uid" => $spread['uid'],
-//                "spread_list" => implode(",",$spread_list)
-//            ];
-//            Db::name("MarketingUser") -> insert($data);
-//        }
+        if ($type == "marketing"){
+            $spread = Db::name("User") -> alias("u") -> leftjoin("MarketingUser mu","u.uid = mu.uid") ->  where("u.uid",$data['spread']) -> field("u.uid,mu.spread_list") -> find();
+            $spread_list = explode(',',$spread['spread_list']);
+            if (!empty($spread_list)){
+                $spread_list[] = "[" . $spread['uid'] . "]";
+            }else{
+                array_push($spread_list,"[".$spread['uid']."]");
+            }
+            $spread_list = array_filter($spread_list);
+                    $data = [
+                "uid" => $user->uid,
+                "spread_uid" => $spread['uid'],
+                "spread_list" => implode(",",$spread_list)
+            ];
+            Db::name("MarketingUser") -> insert($data);
+        }
 
         $result = $repository->returnToken($user, $tokenInfo);
         $result['uid'] = $user->uid;

app/controller/api/store/service/Huafei.php

@@ -185,7 +185,9 @@ class Huafei extends BaseController
 			}else{
 				return app('json')->fail('创建话费充值预支付订单失败');
 			}
-		}else{
+        } elseif ($verify['code'] == '1004') {
+            return app('json')->fail('各位用户您好：因中国移动充值端口升级，目前暂时无法使用，恢复充值需要等待官方通知，感谢理解');
+        } else {
 			return app('json')->fail($verify['msg'].'MSG');
 		}
     }