Merge branch 'talksec' of 121.43.114.153:/home/git/repositories/shopnc into talksec

admin/control/person_bonus.php

@@ -125,6 +125,7 @@ class activity_bonus
     }
 }
 
+require_once (BASE_ROOT_PATH . '/admin/control/control.php');
 class person_bonusControl extends SystemControl
 {
     const EXPORT_SIZE = 5000;

mobile/control/member_bonus.php

@@ -22,7 +22,7 @@ require_once(BASE_ROOT_PATH . '/helper/url_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/invite_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/activity_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/room_helper.php');
-
+require_once(BASE_ROOT_PATH . '/admin/control/person_bonus.php');
 
 use room\proto_type;
 class member_bonusControl extends mbMemberControl
@@ -52,6 +52,9 @@ class member_bonusControl extends mbMemberControl
         $result['convert_ratio'] = 100;
 
         $result['other_room'] = room_helper::page_rooms(['type' => proto_type::room_chat],'steps_count desc,room_id desc');
+
+        $result['daliy_bonus'] = $this->daliy_bonus_url();
+
         return self::outsuccess($result);
     }
 
@@ -110,6 +113,37 @@ class member_bonusControl extends mbMemberControl
         return self::outsuccess($result);
     }
 
+    //福利社 每日领红包
+    private function daliy_bonus_url()
+    {
+        $url = rkcache('daliy_bonus_url');
+        if($url){
+            return $url;
+        }
+
+        $now = time();
+        $today = date('Y-m-d',$now);
+
+        $maker = new activity_bonus();
+        $input['bonus_rate'] = "30|1500|50#40|600|30#100|100|20";//红包参数
+        $input['type_name']  = "每日签到红包";                     //红包名称
+        $input['type_bless'] = "每天10点 试试手气";                //红包祝福语
+        $input['usable_days']= "30";                            //使用时间
+        $input['send_type']   = 1;                              //1:随机红包
+        $input['start_time']  = $today.' 10:00:00';
+        $input['end_time']    = $today.' 23:59:59';
+
+        $ret = $maker->make($input);
+        if($ret == false) {
+            Log::record("daliy_bonus_url failed",Log::DEBUG);
+            return "";
+        } else {
+            $expire = strtotime($input['end_time']) - $now;
+            wkcache('daliy_bonus_url',$ret['url'],$expire);
+            return $ret['url'];
+        }
+    }
+
     private function format_rates($bonus_rate)
     {
         if ($bonus_rate != null)

mobile/templates/default/talk/system_notice.php

@@ -28,10 +28,6 @@
                     <p class="abstract">留言：</p>
                 </div>
         </div>
-        <div class="handle">
-            <span class="agree_btn" >通过</span>
-            <span class="refusal_btn" >忽略</span>
-        </div>
     </div>
     <h3 class="title">消息类型</h3>
     <div class="weui-cell_box">
@@ -45,8 +41,6 @@
             </div>
         </div>
         <div class="handle">
-            <span class="agree_btn" >通过</span>
-            <span class="refusal_btn" >忽略</span>
         </div>
     </div>
     <h3 class="title">消息类型</h3>