跨境商品支付接入

backendApi/modules/v1/models/lists/shop/GoodsList.php

@@ -76,9 +76,9 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '150'],
                 ],
                 'SELL_TYPE' => [
-                    'header' => '复消购买方式',
+                    'header' => '购买方式',
                     'value' => function($row){
-                        $sellType = array_merge(ShopGoods::LOCAL_PAY, ShopGoods::ONLINE_PAY);
+                        $sellType = ShopGoods::payTypes();
                         $sel = explode(',',$row['SELL_TYPE']);
                         $value = '';
                         foreach ($sel as $v){
@@ -199,25 +199,11 @@ class GoodsList extends \common\libs\dataList\DataList implements DataListInterf
                 'STATUS'=> ['name'=> '状态', 'other'=> 'select', 'selectData'=> [['id'=> 1, 'name'=> '已上架'],['id'=> 0, 'name'=> '已下架'],]],
                 'GOODS_NAME'=> ['name'=> '商品名称'],
                 'GOODS_NO'=> ['name'=> '商品编号'],
-                'SELL_TYPE'=> ['name'=> '复消购买方式', 'other'=> 'select', 'selectData'=> [$this->getSaleType()]],
+                'SELL_TYPE'=> ['name'=> '购买方式', 'other'=> 'select', 'selectData'=> [ShopGoods::payTypes()]],
                 'SELL_PRICE'=> ['name'=> '销售价格'],
                 'PRICE_PV'=> ['name'=> '销售PV'],
             ];
         }
         return $this->filterTypes;
     }
-
-    public function getSaleType()
-    {
-        $saleTypeList = [];
-        $saleType = array_merge(ShopGoods::LOCAL_PAY, ShopGoods::ONLINE_PAY);
-        foreach ($saleType as $index => $item) {
-            $saleTypeList[] = [
-                'id' => $index,
-                $item
-            ];
-        }
-
-        return $saleTypeList;
-    }
 }

common/models/ShopGoods.php

@@ -204,17 +204,11 @@ class ShopGoods extends \common\components\ActiveRecord
             'online' => [
                 'name' => 'IPay88'
             ],
-            'WECHAT'  => [
-                'name' => '微信正扫',
+            'WeChat'  => [
+                'name' => '微信',
             ],
-            'WAPWECHAT'  => [
-                'name' => '微信WAP',
-            ],
-            'ALIPAY'  => [
-                'name' => '支付宝正扫',
-            ],
-            'WEBSITEALIPAY'  => [
-                'name' => '支付宝WAP',
+            'ALiPay'  => [
+                'name' => '支付',
             ],
         ];
     }
@@ -261,7 +255,7 @@ class ShopGoods extends \common\components\ActiveRecord
         return $result;
     }
 
-    public static function getBankCode($payCode)
+    public static function bankCode2PayType($payCode)
     {
         return self::BANK_CODE[$payCode];
     }

frontendApi/modules/v1/controllers/ShopController.php

@@ -297,7 +297,7 @@ class ShopController extends BaseController {
             // 银行代码
             $bankCode = $post['payType'];
             // 支付宝WAP/正扫 -> 支付宝支付; 微信WAP/正扫 -> 微信支付
-            $post['payType'] = ShopGoods::getBankCode($bankCode);
+            $post['payType'] = ShopGoods::bankCode2PayType($bankCode);
 
             $formModel = new ApproachOrderForm();
             $formModel->scenario = 'userOrder';