修改红包价，以及注册用户时，增加事物验证

data/model/member.model.php

@@ -236,22 +236,6 @@ class memberModel extends Model
         }
     }
 
-    private function empty_model($param)
-    {
-        $member = array();
-
-        $passwd = trim($param['member_passwd']);
-        $member['member_passwd'] = empty($passwd) ? $passwd : md5($passwd);
-
-        $member['member_time'] = time();
-        $member['member_login_time'] = time();
-        $member['member_old_login_time'] = time();
-        $member['member_login_ip'] = getIp();
-        $member['member_old_login_ip'] = $member['member_login_ip'];
-
-        return $member;
-    }
-
     /**
      * 注册商城会员
      *
@@ -266,24 +250,38 @@ class memberModel extends Model
 
         try {
             $this->beginTransaction();
-            $member_info = $this->empty_model($param);
 
-            foreach ($param as $key => $value) {
+            $info = [];
+            foreach ($param as $key => $value)
+            {
                 if ($key == 'member_passwd') {
                     $passwd = trim($param['member_passwd']);
-                    $member_info['member_passwd'] = empty($passwd) ? $passwd : md5($passwd);
+                    $info['member_passwd'] = empty($passwd) ? $passwd : md5($passwd);
                 } elseif ($key == 'member_time') {
-                    $member_info['member_time'] = time();
+                    $info['member_time'] = time();
                 } elseif ($key == 'member_login_time') {
-                    $member_info['member_login_time'] = time();
+                    $info['member_login_time'] = time();
                 } elseif ($key == 'member_login_ip') {
-                    $member_info['member_login_ip'] = getIp();
+                    $info['member_login_ip'] = getIp();
                 } else {
-                    $member_info[$key] = $value;
+                    $info[$key] = $value;
+                }
+            }
+
+            if(is_mobile())
+            {
+                $mobile = $info['member_mobile'];
+                if(empty($mobile)) {
+                    throw new Exception();
+                }
+
+                $member = $this->getMemberInfo(array('member_mobile' => $mobile));
+                if(!empty($member)) {
+                    throw new Exception();
                 }
             }
 
-            $insert_id = $this->table('member')->insert($member_info);
+            $insert_id = $this->table('member')->insert($info);
             if (!$insert_id) {
                 throw new Exception();
             }

helper/predeposit_helper.php

@@ -193,13 +193,7 @@ class RateMoney
     public function calc_price($price,&$rates)
     {
         $cur_price = intval($this->calc_money($price,$rates) * 100 + 0.5);
-        $min_price = intval($price * (100 - self::PRED_RATE) + 0.5);
-
-        if($cur_price < $min_price) {
-            return $cur_price / 100;
-        } else {
-            return $min_price / 100;
-        }
+        return $cur_price / 100;
     }
     static function scale() {
         return (100 - self::PRED_RATE) / 100;
@@ -314,8 +308,7 @@ class predeposit_helper
         }
         else
         {
-            $scale = RateMoney::scale();
-            return $scale * $goods_price;
+            return $goods_price;
         }
     }
 

mobile/control/login.php

@@ -42,10 +42,6 @@ class loginControl extends mobileHomeControl
             return self::outsuccess(array('member_id' => $_SESSION['member_id'],'HPHPSESSID' => $_SESSION['MPHPSESSID']));
         }
 
-//        if (process::islock('login')) { //检查登录操作是否已经锁定
-//            return self::outerr(errcode::ErrOperRepeat);
-//        }
-
         $type = intval(trim($_POST['type']));
         if (!isset($type) || !in_array($type, $this->client_login_type_array)) {
             return self::outerr(errcode::ErrParamter, 'type error.');
@@ -209,7 +205,9 @@ class loginControl extends mobileHomeControl
             return self::outerr($ret['code'], $ret['msg']);
         }
 
+
         $model = Model('member');
+
         $ret =$model->getMemberInfo(array('member_mobile' => $mobile));
         if (!empty($ret)) {
             return self::outerr(errcode::ErrUserExisted, "用户已经存在.");
@@ -301,7 +299,6 @@ class loginControl extends mobileHomeControl
 
         // 判断是否处理
         $model = Model('member');
-        // 判断是否已经注册
         $ret = $model->getMemberInfo(array('member_mobile' => $mobile));
         if (empty($ret))
         {
@@ -316,7 +313,6 @@ class loginControl extends mobileHomeControl
                     'member_mobile_bind' => 1);
                 $member_id = $model->addMember($member_info);
             }
-
             if(!isset($member_id) || $member_id == false) {
                 return self::outerr(errcode::ErrMemberNotExist);
             }