add to local

helper/predeposit_helper.php

@@ -54,20 +54,6 @@ class RateMoney
         krsort($this->mRates);
     }
 
-    public function balance($money)
-    {
-        $money = intval($money * 100 + 0.5);
-        $total = intval($this->total() * 100 + 0.5);
-
-        if($money > $total)
-        {
-            if(isset($this->mRates[self::PRED_RATE]) == false) {
-                $this->mRates[self::PRED_RATE] = 0.00;
-            }
-            $this->mRates[self::PRED_RATE] += ($money - $total) / 100;
-        }
-    }
-
     public function resort()
     {
         krsort($this->mRates);
@@ -205,8 +191,6 @@ class predeposit_helper
 {
     private $model_pd;
     private $member_id;
-    private $mTotalPred;
-    private $mFreezePred;
     private $mRates;
     private $mBonusState;
     private $mRateVersion; //用来记录，红包过期带来的红包变化
@@ -217,8 +201,6 @@ class predeposit_helper
         $this->member_id = $member_id;
 
         $pd_array = Model('member')->getMemberPdInfo($this->member_id);
-        $this->mTotalPred  = $pd_array['available_predeposit'];   // 当前预存款
-        $this->mFreezePred = $pd_array['freeze_predeposit'];      // 当前预存款冻结
         $this->mRateVersion  = intval($pd_array['rate_version']);
         $this->init_rate();
     }
@@ -252,7 +234,6 @@ class predeposit_helper
             $this->mRates = new RateMoney(array());
             $items = $mod_bonus->getUsableBonus($this->member_id);
             $this->mRates->add_bonuses($items);
-            $this->mRates->balance($this->mTotalPred);
             $bonus_rate = $this->mRates->format();
 
             $this->mBonusState = [];
@@ -398,14 +379,13 @@ class predeposit_helper
         return $bonuses;
     }
 
-    public function total_pred() {
-        return $this->mTotalPred;
-    }
-    public function freeze_pred() {
-        return $this->mFreezePred;
+    public function total_bonus()
+    {
+        return $this->mRates->total();
     }
+
     public function is_enough($money) {
-        return intval($this->total_pred() * 100) >= intval($money * 100);
+        return intval($this->total_bonus() * 100) >= intval($money * 100);
     }
 
     public function person_enough($money,&$bonus_rate)

helper/shaker_helper.php

@@ -172,7 +172,7 @@ class shaker_helper
     private function lost(&$err)
     {
         $pred = new predeposit_helper($_SESSION['member_id']);
-        $total_amount = $pred->total_pred();
+        $total_amount = $pred->total_bonus();
 
         if(intval($total_amount * 100 + 0.5) <= 0) {
             $err = array('code' => errcode::ErrShake,'msg' => self::err_msg);

mobile/control/bonusex.php

@@ -1018,21 +1018,22 @@ function bonnus_out_goods($output)
 
 function bonus_out_rule()
 {
-    echo
-    '<div class="prompt text_left">
-        <p class="pro">红包使用方法</p>
-    </div>
-    <div class="briefing text_left">
-        <p><span>1.</span> 在熊猫美妆APP或微信商城中购物，即可使用。</p>
-        <p><span>2.</span> 购物时,系统优先使用折扣率大的红包。</p>
-        <p><span>3.</span> 不同折扣红包自动叠加使用，福利更实在。</p>
-        <p><span>4.</span> 也可以在APP中，把红包分享给亲友。</p>
-        <p><span>5.</span> 红包是丽人员工福利，请勿分享给亲友以外的人。</p>
-  
-        <div class="center briefing_address">
-            公司地址：上海市徐汇区番禺路876号
+    if(!session_helper::isapp()) {
+        echo
+        '<div class="prompt text_left">
+            <p class="pro">红包使用方法</p>
         </div>
-    </div>';
+        <div class="briefing text_left">
+            <p><span>1.</span> 在熊猫美妆APP或微信商城中购物，即可使用。</p>
+            <p><span>2.</span> 购物时,系统优先使用折扣率大的红包。</p>
+            <p><span>3.</span> 不同折扣红包自动叠加使用，福利更实在。</p>
+            <p><span>4.</span> 也可以在APP中，把红包分享给亲友。</p>
+            <p><span>5.</span> 红包是丽人员工福利，请勿分享给亲友以外的人。</p>      
+            <div class="center briefing_address">
+                公司地址：上海市徐汇区番禺路876号
+            </div>
+        </div>';
+    }
 }
 
 function bonus_out_brands()

mobile/control/member_bonus.php

@@ -27,11 +27,54 @@ class member_bonusControl extends mbMemberControl
         parent::__construct();
         $this->mPred = new predeposit_helper($_SESSION['member_id']);
     }
+    public function predepositexOp()
+    {
+        $result = [];
+        $result['bonus_total']  = $this->mPred->total_bonus();
+
+        $bonus_state = $this->mPred->bonus_state();
+        $expiring = $bonus_state['expiring'];
+        $warning = "";
+        if(!empty($expiring))
+        {
+            $expiring = intval($expiring * 100 + 0.5);
+            if($expiring > 0) {
+                $expiring = $expiring / 100;
+                $warning = "您有{$expiring}元红包即将过期";
+            }
+        }
+
+        $result = array_merge($result,$bonus_state);
+        $bonus_rate = $this->mPred->bonus_rate();
+
+        if($bonus_rate != null)
+        {
+            $rates = $bonus_rate->format();
+            $rates_money = [];
+            foreach ($rates as $rate => $money) {
+                $item['rate']  = $rate;
+                $item['total'] = $money;
+                $rates_money[] = $item;
+            }
+        } else {
+            $rates_money = null;
+        }
+
+        if(empty($rates_money)) {
+            $result['bonus_rate'] = null;
+        } else {
+            $result['bonus_rate'] = $rates_money;
+        }
+        $result['avatar'] = session_helper::avatar();
+        $result['sub_titles'] = ['shake' => '','invite' => '','friends' => '','bonus_detail' => $warning];
+
+        return self::outsuccess($result);
+    }
     public function predepositOp()
     {
         $result = [];
-        $result['predeposit_total']  = $this->mPred->total_pred();
-        $result['predeposit_freeze'] = $this->mPred->freeze_pred();
+        $result['predeposit_total']  = $this->mPred->total_bonus();
+        $result['predeposit_freeze'] = 0;
 
         $bonus_state = $this->mPred->bonus_state();
         $result = array_merge($result,$bonus_state);
@@ -65,6 +108,7 @@ class member_bonusControl extends mbMemberControl
         return self::outsuccess($result);
     }
 
+
     private function fill_param($input,$bonus_rate)
     {
         $param = $input;