stanley-king 7 gadi atpakaļ
vecāks
revīzija
3c7ef38b67

+ 21 - 10
helper/room/bargain_manager.php

@@ -40,14 +40,18 @@ class room_extend
             return intval($this->mParams['dateid']);
         }
     }
+    public function exist()
+    {
+        return !empty($this->mParams);
+    }
+
     public function date_empty($dateid)
     {
-        if(empty($this->mParams)) return true;
         if($this->dateid() == $dateid) {
             return false;
         }
         else {
-            return false;
+            return true;
         }
     }
 }
@@ -143,7 +147,6 @@ class bargain_manager
     const normal = 1;
     const closing = 2;
 
-    private $mDateId;
     private $mFriends;
     private $mParams;
     private $mBargainId;
@@ -153,7 +156,6 @@ class bargain_manager
     public function __construct($roomid)
     {
         $this->mRoomId = $roomid;
-        $this->mDateId = strtotime(date('Y-m-d',time()));
         $mod_bargain = Model('room_bargain');
         $info = $mod_bargain->getBargainByRoom($roomid,true);
         $this->mBargain = new bargain($info);
@@ -171,6 +173,9 @@ class bargain_manager
         }
     }
 
+    private function dateid() {
+        return strtotime(date('Y-m-d',time()));
+    }
     public function bargain($userid,&$state)
     {
         $state = self::unknown_state;
@@ -187,18 +192,24 @@ class bargain_manager
         $info = $mod_room->getRoomExtend($userid);
 
         $room_extend = new room_extend($info);
-        $count = $room_extend->bargain_count($this->mDateId);
+        $count = $room_extend->bargain_count($this->dateid());
         $value = $this->mParams->bargain($count,$completed);
         if($value === false) {
             return false;
         }
         else
         {
-
-            if(!$room_extend->date_empty($this->mDateId)) {
-                $mod_room->editExtend($userid,['bargain_count' => ['exp', 'bargain_count+1']]);
-            } else {
-                $mod_room->addExtend($userid,['bargain_count' => 1,'dateid' => $this->mDateId]);
+            if($room_extend->exist())
+            {
+                if($room_extend->date_empty($this->dateid())) {
+                    $mod_room->editExtend($userid,['bargain_count' => 1,'dateid' => $this->dateid()]);
+                }
+                else {
+                    $mod_room->editExtend($userid,['bargain_count' => ['exp', 'bargain_count+1']]);
+                }
+            }
+            else {
+                $mod_room->addExtend($userid,['bargain_count' => 1,'dateid' => $this->dateid()]);
             }
 
             $mod_bargain = Model('room_bargain');

+ 1 - 0
mobile/templates/default/bargain/bargain.php

@@ -380,6 +380,7 @@
                 }).send();
             }
             else if(msg_type == 'bargain_close') {
+                console.log('bargain_close');
                 count_down_time = -1;
             }
         }