stanley-king 4 年 前
コミット
60f1ef8193
3 ファイル変更34 行追加10 行削除
  1. 5 4
      data/config/dev/vgoods.ini.php
  2. 27 6
      data/config/prod/vgoods.ini.php
  3. 2 0
      mobile/control/index.php

+ 5 - 4
data/config/dev/vgoods.ini.php

@@ -25,10 +25,11 @@ $handlers = [];
 #additional 预先提供的参数
 
 #会员卡 vip_card
-$handlers[6217] = ['type' => 'member_card', 'order_method' => '', 'paid_oper' => 'auto',
-                                            'paid_method' => 'OnMCardPaidSuccess',
-                                            'input_params' => [],
-                                            'additional' => ['card_type' => 'year']];
+$mcard_params =['type' => 'member_card', 'order_method' => '', 'paid_oper' => 'auto',
+                'paid_method' => 'OnMCardPaidSuccess',
+                'input_params' => [],
+                'additional' => ['card_type' => 'year']];
+$handlers[6217] = $mcard_params;
 
 #oil card
 $oil_params = ['type' => 'oil_card', 'order_method' => 'OnAssignOilCard',

+ 27 - 6
data/config/prod/vgoods.ini.php

@@ -3,8 +3,8 @@ declare(strict_types=0);
 
 $config['exclude_preferential_goods_ids'] = [6217];
 $config['card_commonid'] = ['oil' => 3449, 'phone' => 3450];
-$config['vgoods_spec_card'] = ['oil'   => [6218 => 200, 6219 => 500,6220 => 1000,6227 => 100],
-    'phone' => [6221 => 100]];
+$config['vgoods_spec_card'] = ['oil' => [6218 => 200, 6219 => 500,6220 => 1000,6227 => 100],
+                               'phone' => [6221 => 100]];
 
 $config['tips'] =  ['first_order' => '首次充值享受会员价95折',
                     'vip_first_order' => '会员充值全场95折',
@@ -15,10 +15,31 @@ $handlers = [];
 #type:虚拟商品类型,order_method下午单后的自动操作函数,
 #paid_oper 支付完成后的操作类型,auto 表示自动,manual 表示人工点击,paid_method表示点击调用的方法
 #input_params 表示输入必须带的参数。
-$vipcard_params = ['type' => 'member_card', 'order_method' => '', 'paid_oper' => 'auto', 'paid_method' => 'OnMCardPaidSuccess', 'input_params' => [], 'additional' => ['card_type' => 'year']];
-$handlers[6217] = $vipcard_params;
+$mcard_params =['type' => 'member_card', 'order_method' => '', 'paid_oper' => 'auto',
+    'paid_method' => 'OnMCardPaidSuccess',
+    'input_params' => [],
+    'additional' => ['card_type' => 'year']];
+$handlers[6217] = $mcard_params;
 
-$handlers[6218] = ['type' => 'oil_card',   'order_method' => 'OnAssignOilCard', 'paid_oper' => 'manual', 'paid_method' => 'OnOilPaidSuccess', 'input_params' => ['card_id']];
-$handlers[6219] = ['type' => 'phone_card', 'order_method' => 'OnAssignPhoneCard', 'paid_oper' => 'manual', 'paid_method' => 'OnPhonePaidSuccess', 'input_params' => ['card_id']];
+#oil card
+$oil_params =  ['type' => 'oil_card', 'order_method' => 'OnAssignOilCard',
+                'paid_oper' => 'manual',
+                'paid_method' => 'OnOilPaidSuccess',
+                'cancel_method' => 'OnOilCancel',
+                'input_params' => ['card_no','card_type']];
+
+$handlers[6218] = $oil_params;
+$handlers[6219] = $oil_params;
+$handlers[6220] = $oil_params;
+$handlers[6227] = $oil_params;
+
+#phone card
+$phone_card_prams = ['type' => 'phone_card', 'order_method' => 'OnAssignPhoneCard',
+    'paid_oper' => 'manual',
+    'paid_method' => 'OnPhonePaidSuccess',
+    'cancel_method' => 'OnPhoneCancel',
+    'input_params' => ['card_no','card_type']];
+
+$handlers[6221] = $phone_card_prams;
 
 $config['vgoods_handlers'] = $handlers;

+ 2 - 0
mobile/control/index.php

@@ -204,6 +204,8 @@ class indexControl extends specialControl
         }
 
         $commonid = intval($card_commids[$card_type]);
+        Log::record("card_type = {$card_type} commonid={$commonid}",Log::DEBUG);
+
         if($commonid > 0)
         {
             $mod_goods = Model('goods');