修改支付通道

app/data/controller/ShopPayment.php

@@ -8,7 +8,7 @@ use think\admin\Controller;
 use think\admin\extend\CodeExtend;
 
 /**
- * 支付参数通道
+ * 支付参数支付
  * Class ShopPayment
  * @package app\data\controller
  */
@@ -39,7 +39,7 @@ class ShopPayment extends Controller
         $this->title = '支付参数管理';
         $query = $this->_query($this->table);
         $query->where(['deleted' => 0])->order('sort desc,id desc');
-        $query->equal('type,status')->like('name')->dateBetween('create_at')->page();
+        $query->like('name,code')->equal('type,status')->dateBetween('create_at')->page();
     }
 
     /**

app/data/controller/api/Auth.php

@@ -47,7 +47,7 @@ abstract class Auth extends Controller
         $this->type = $this->request->header('api-name') ?: input('api');
         $this->type = $this->type ?: $this->request->header('api-type');
         if (empty($this->type) || empty(UserService::TYPES[$this->type])) {
-            $this->error("接口通道未定义！");
+            $this->error("接口支付未定义！");
         }
         // 获取用户数据
         $this->user = $this->getUser();

app/data/controller/api/Login.php

@@ -32,7 +32,7 @@ class Login extends Controller
     {
         $this->type = input('api', UserService::API_TYPE_WAP);
         if (empty(UserService::TYPES[$this->type])) {
-            $this->error("接口通道[{$this->type}]未定义规则！");
+            $this->error("接口支付[{$this->type}]未定义规则！");
         }
     }
 

app/data/controller/api/auth/Order.php

@@ -87,7 +87,7 @@ class Order extends Auth
             if ($goodsInfo['limit_low_vip'] > $this->user['vip_code']) $this->error('用户等级不够');
             // 商品库存检查
             if ($goodsItem['stock_sales'] + $count > $goodsItem['stock_total']) $this->error('商品库存不足');
-            // 支付通道处理
+            // 支付支付处理
             $_allowPayments = [];
             foreach (str2arr($goodsInfo['payment']) as $code) {
                 if (is_null($allowPayments) || in_array($code, $allowPayments)) $_allowPayments[] = $code;
@@ -281,7 +281,7 @@ class Order extends Auth
     }
 
     /**
-     * 获取支付通道数据
+     * 获取支付支付数据
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException

app/data/service/PaymentService.php

@@ -29,7 +29,7 @@ abstract class PaymentService
     const PAYMENT_JOINPAY_GZH = 'joinpay_gzh';
     const PAYMENT_JOINPAY_XCX = 'joinpay_xcx';
 
-    // 微信商户通道
+    // 微信商户支付
     const PAYMENT_WECHAT_APP = 'wechat_app';
     const PAYMENT_WECHAT_GZH = 'wechat_gzh';
     const PAYMENT_WECHAT_XCX = 'wechat_xcx';
@@ -196,7 +196,7 @@ abstract class PaymentService
     }
 
     /**
-     * 获取支付通道名称
+     * 获取支付支付名称
      * @param string $type
      * @return string
      */
@@ -221,7 +221,7 @@ abstract class PaymentService
     }
 
     /**
-     * 获取通道配置参数
+     * 获取支付配置参数
      * @param string $code
      * @param array $payment
      * @return array [code, type, params]

app/data/service/UserService.php

@@ -21,7 +21,7 @@ class UserService extends Service
     const API_TYPE_ANDROID = 'android';
 
     const TYPES = [
-        // 接口通道配置（不需要的直接注释）
+        // 接口支付配置（不需要的直接注释）
         UserService::API_TYPE_WAP     => [
             'name' => '手机浏览器',
             'auth' => 'phone',

app/data/service/payment/EmptyPaymentService.php

@@ -7,7 +7,7 @@ use think\admin\extend\CodeExtend;
 use think\admin\Exception;
 
 /**
- * 空支付通道
+ * 空支付支付
  * Class EmptyPaymentService
  * @package app\data\service\payment
  */

app/data/view/shop_payment/form.html

@@ -8,7 +8,7 @@
             <span class="color-green font-w7">支付名称</span>
             <span class="color-desc margin-left-5">Payment Name</span>
             <input class="layui-input" required placeholder="请输入支付名称" maxlength="50" name="name" value="{$vo.name|default=''}"/>
-            <span class="help-block"><b>必填，</b>请填写支付参数名称，通道名称尽量不要重复，字符不要太长一般4-6个汉字</span>
+            <span class="help-block"><b>必填，</b>请填写支付参数名称，支付名称尽量不要重复，字符不要太长一般4-6个汉字</span>
         </label>
 
         <div class="layui-form-item">

app/data/view/shop_payment/index.html

@@ -23,8 +23,8 @@
             <th class='list-table-sort-td'>
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
             </th>
-            <th class="text-left nowrap">通道名称</th>
+            <th class="text-left nowrap">支付名称</th>
-            <th class="text-left nowrap">通道编号</th>
+            <th class="text-left nowrap">支付编号</th>
             <th class="text-left nowrap">支付方式</th>
             <th class="text-left nowrap">使用状态</th>
             <th class="text-left nowrap">创建时间</th>

app/data/view/shop_payment/index_search.html

@@ -2,9 +2,16 @@
     <legend>条件搜索</legend>
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">通道名称</label>
+            <label class="layui-form-label">支付名称</label>
             <label class="layui-input-inline">
-                <input name="name" value="{:input('name','')}" placeholder="请输入通道名称" class="layui-input">
+                <input name="name" value="{:input('name','')}" placeholder="请输入支付名称" class="layui-input">
+            </label>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">支付编号</label>
+            <label class="layui-input-inline">
+                <input name="code" value="{:input('code','')}" placeholder="请输入支付编号" class="layui-input">
             </label>
         </div>