add priority card to oil page and phone page

helper/mtopcard/mtopcard.php

@@ -74,4 +74,30 @@ function scard_type($card_type)
 require_once(BASE_HELPER_PATH . '/mtopcard/topcard.php');
 require_once(BASE_HELPER_PATH . '/mtopcard/user_topcards.php');
 require_once(BASE_HELPER_PATH . '/mtopcard/CardPaper.php');
-require_once(BASE_HELPER_PATH . '/mtopcard/cards_helper.php');
+require_once(BASE_HELPER_PATH . '/mtopcard/cards_helper.php');
+
+function priority_cards($member_id, $page_type)
+{
+    if($page_type == 'oil') {
+        $types = [PetroChinaCard,SinopecCard];
+    }
+    else {
+        $types = [PhoneCard];
+
+    }
+    $user_cards = new user_topcards($member_id);
+    return $user_cards->priority_cards($types);
+}
+
+function topcard_format($card_list)
+{
+    $ret = [];
+    foreach ($card_list as $item) {
+        $card = new topcard($item);
+        $item = $card->format();
+        $item['card_type'] = scard_type($item['card_type']);
+        $ret[] = $item;
+    }
+    return $ret;
+}
+

helper/mtopcard/user_topcards.php

@@ -37,6 +37,32 @@ class user_topcards
         }
     }
 
+    public function priority_cards($types)
+    {
+        $items = [];
+        foreach ($this->mCards as $card)
+        {
+            $type = $card->card_type();
+            if($type == PetroChinaCard) {
+                $items[PetroChinaCard] = $card;
+            }
+            elseif($type == SinopecCard) {
+                $items[SinopecCard] = $card;
+            }
+            else {
+                $items[PhoneCard] = $card;
+            }
+        }
+
+        $ret = [];
+        foreach ($items as $key => $val) {
+            if(in_array($val->card_type(),$types))
+                $ret[] = $val->format();
+        }
+
+        return $ret;
+    }
+
     public function addCard(string $card_no, int $card_type)
     {
         $card_id = $this->has_card($card_no, $card_type);

helper/pay/jspay.php

@@ -8,7 +8,7 @@
 
 namespace Pay;
 
-define(JSPAY_PATHEX, BASE_DATA_PATH . '/api/pub_wxpay');
+define('JSPAY_PATHEX', BASE_DATA_PATH . '/api/pub_wxpay');
 require_once(JSPAY_PATHEX . '/lib/WxPay.Api.php');
 require_once(JSPAY_PATHEX . '/lib/WxPay.Config.php');
 require_once(JSPAY_PATHEX . '/lib/WxPay.Data.php');

helper/pay/minipay.php

@@ -8,7 +8,7 @@
 
 namespace Pay;
 
-define(MINIPAY_PATHEX, BASE_DATA_PATH . '/api/mini_wxpay');
+define('MINIPAY_PATHEX', BASE_DATA_PATH . '/api/mini_wxpay');
 
 require_once(MINIPAY_PATHEX . '/lib/WxPay.Api.php');
 require_once(MINIPAY_PATHEX . '/lib/WxPay.Config.php');

mobile/control/index.php

@@ -12,18 +12,21 @@ use mcard\user_mcards;
 
 defined('InShopNC') or exit('Access Invalid!');
 
-require_once(BASE_ROOT_PATH . '/helper/goods_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/special_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/index_tab.php');
-require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/third_author/wxauthor.php');
 require_once(BASE_ROOT_PATH . '/mobile/control/special.php');
-require_once(BASE_ROOT_PATH . '/helper/third_author/wxauthor.php');
-require_once(BASE_ROOT_PATH . '/helper/session_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/url_helper.php');
-require_once(BASE_ROOT_PATH . '/helper/room/tpl_group_home.php');
-require_once(BASE_ROOT_PATH . '/helper/room/tpl_chatwo_home.php');
+
+require_once(BASE_HELPER_PATH . '/goods_helper.php');
+require_once(BASE_HELPER_PATH . '/special_helper.php');
+require_once(BASE_HELPER_PATH . '/index_tab.php');
+require_once(BASE_HELPER_PATH . '/util_helper.php');
+require_once(BASE_HELPER_PATH . '/third_author/wxauthor.php');
+require_once(BASE_HELPER_PATH . '/third_author/wxauthor.php');
+require_once(BASE_HELPER_PATH . '/session_helper.php');
+require_once(BASE_HELPER_PATH . '/url_helper.php');
+require_once(BASE_HELPER_PATH . '/room/tpl_group_home.php');
+require_once(BASE_HELPER_PATH . '/room/tpl_chatwo_home.php');
 require_once(BASE_HELPER_PATH . '/mcard/mcard.php');
+require_once(BASE_HELPER_PATH . '/mtopcard/mtopcard.php');
+
 
 class indexControl extends specialControl
 {
@@ -160,18 +163,20 @@ class indexControl extends specialControl
     public function card_goodsOp()
     {
         global $config;
-        $card_type = $_GET['card_type'];
-        if(empty($card_type)) {
+        $page_type = $_GET['page_type']; //oil or phone page.
+        if(empty($page_type)) {
             return self::outerr(errcode::ErrParamter);
         }
-        $goods = $this->card_goods($card_type);
 
+        $goods = $this->card_goods($page_type);
         $fVip = mcard\isVip(session_helper::memberid());
         $ret = [];
 
         $discount = 0.0;
         if(session_helper::memberid() > 0)
         {
+            $card_list =  mtopcard\priority_cards(session_helper::memberid(),$page_type);
+            $ret['cards'] = mtopcard\topcard_format($card_list);
             if($fVip)
             {
                 if(session_helper::first_order()) {
@@ -186,6 +191,7 @@ class indexControl extends specialControl
         }
         else {
             $ret['tips'] = $config['tips']['first_order'];
+            $ret['cards'] = [];
             $discount = 0.02;
         }
 
@@ -235,6 +241,5 @@ class indexControl extends specialControl
         else {
             return [];
         }
-
     }
 }

mobile/control/member_card.php

@@ -26,22 +26,10 @@ class member_cardControl extends mbMemberControl
             $card_list = $this->mCardModel->getCardsByType(session_helper::memberid(),$card_type);
         }
 
-        $ret = $this->format($card_list);
+        $ret = mtopcard\topcard_format($card_list);
         self::outsuccess(['card_list' => $ret]);
     }
 
-    private function format($card_list)
-    {
-        $ret = [];
-        foreach ($card_list as $item) {
-            $card = new mtopcard\topcard($item);
-            $item = $card->format();
-            $item['card_type'] = mtopcard\scard_type($item['card_type']);
-            $ret[] = $item;
-        }
-        return $ret;
-    }
-
     public function card_addOp()
     {
         $card_type = mtopcard\topcard_type($_GET['card_type']);