order_id, trand_id 替换

app/process/CreateTables.php

@@ -331,9 +331,9 @@ class CreateTables
 
     protected string $sdk_order = "CREATE TABLE IF NOT EXISTS `sdk_order_{{MONTH}}` (
   `id` bigint(20) NOT NULL AUTO_INCREMENT,
-  `orderid` varchar(60) NOT NULL COMMENT '我方订单号',
-  `tradeid` varchar(60) DEFAULT '' COMMENT '交易流水号',
-  `cp_orderid` varchar(60) NOT NULL COMMENT '研发订单号',
+  `order_id` varchar(60) NOT NULL COMMENT '我方订单号',
+  `trade_id` varchar(60) DEFAULT '' COMMENT '交易流水号',
+  `cp_order_id` varchar(60) NOT NULL COMMENT '研发订单号',
   `ext` varchar(200) DEFAULT NULL COMMENT 'CP扩展参数',
   `pay_channel_id` smallint(6) NOT NULL COMMENT '支付渠道ID',
   `money` float NOT NULL COMMENT '面额(元)',
@@ -367,11 +367,11 @@ class CreateTables
   `product_name` varchar(64) DEFAULT NULL COMMENT '充值商品名',
   `package_name` varchar(64) DEFAULT NULL COMMENT '包名',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `orderid` (`orderid`),
+  UNIQUE KEY `order_id` (`order_id`),
   KEY `uid` (`uid`),
   KEY `user_name` (`user_name`),
-  KEY `tradeid` (`tradeid`),
-  KEY `cp_orderid` (`cp_orderid`),
+  KEY `trade_id` (`trade_id`),
+  KEY `cp_order_id` (`cp_order_id`),
   KEY `game_id` (`game_id`),
   KEY `sync_status` (`sync_status`),
   KEY `send_status` (`send_status`),
@@ -380,4 +380,4 @@ class CreateTables
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='订单记录表';";
 
 
-}
+}

app/v1/controller/customer/SdkOrderController.php

@@ -35,8 +35,8 @@ class SdkOrderController extends BaseController
     public function index(Request $request): Response
     {
         $where = $request->more([
-            ['orderid', ''],
-            ['tradeid', ''],
+            ['order_id', ''],
+            ['trade_id', ''],
             ['game_id', ''],
             ['user_name', ''],
             ['role_id', ''],
@@ -47,7 +47,7 @@ class SdkOrderController extends BaseController
             ['limit','']
         ]);
         // 账号名|订单号|交易订单号 不能同时为空
-        if(empty($where['user_name']) && empty($where['orderid']) && empty($where['tradeid'])){
+        if(empty($where['user_name']) && empty($where['order_id']) && empty($where['trade_id'])){
             return $this->fail('账号名|订单号|交易订单号 不能同时为空');
         }
         // $query = $this->logic->search($where);
@@ -64,8 +64,8 @@ class SdkOrderController extends BaseController
 
     public function send(Request $request): Response
     {
-        $orderid = $request->input('orderid');
-        $data = $this->logic->send($orderid);
+        $order_id = $request->input('order_id');
+        $data = $this->logic->send($order_id);
         return $this->success($data);
     }
 

app/v1/logic/customer/SdkOrderLogic.php

@@ -62,7 +62,6 @@ class SdkOrderLogic extends BaseLogic
         $table_name_array = $this->queryOrdersByDateRange($startDate, $endDate);
        
         // 合并表 union all
-        
         $where_sql = "";
         if(!empty($where['game_id'])){
             $where_sql .= " AND game_id IN({$where['game_id']})";
@@ -144,9 +143,9 @@ class SdkOrderLogic extends BaseLogic
     /**
      * 补发
      */
-    public function send($orderid)
+    public function send($order_id)
     {
-      $res = Redis::lpush("request_cp_callback_queue", $orderid);
+      $res = Redis::lpush("request_cp_callback_queue", $order_id);
       return $res;
     }
 }

app/v1/logic/gameLog/UserLogLogic.php

@@ -188,7 +188,7 @@ class UserLogLogic extends BaseLogic
         $data = $this->trandformListColumn($data, ['game', 'ip', 'agent','auth', 'pay_channel']);
         $data = array_map(function($item){
             return [
-                'orderid' => $item['orderid'],
+                'order_id' => $item['order_id'],
                 'user_name' => $item['user_name'],
                 'agent_id' => $item['agent_id'],
                 'site_id' => $item['site_id'],
@@ -274,7 +274,7 @@ class UserLogLogic extends BaseLogic
 
       // 先选择字段，包括计算字段
       $rechargeRankQuery->field('user_name,sum(money) as searchTotalMoney,
-            orderid,
+            order_id,
             game_id,
             media_id,
             agent_id,
@@ -477,4 +477,4 @@ class UserLogLogic extends BaseLogic
 
     }
 
-}
+}

app/v1/validate/customer/SdkOrderValidate.php

@@ -17,8 +17,8 @@ class SdkOrderValidate extends Validate
      * 定义验证规则
      */
     protected $rule =   [
-        'orderid' => 'require',
-        'cp_orderid' => 'require',
+        'order_id' => 'require',
+        'cp_order_id' => 'require',
         'pay_channel' => 'require',
         'money' => 'require',
         'paid_amount' => 'require',
@@ -44,8 +44,8 @@ class SdkOrderValidate extends Validate
      * 定义错误信息
      */
     protected $message  =   [
-        'orderid' => '订单号必须填写',
-        'cp_orderid' => '研发订单号必须填写',
+        'order_id' => '订单号必须填写',
+        'cp_order_id' => '研发订单号必须填写',
         'pay_channel' => '充值方式必须填写',
         'money' => '金额必须填写',
         'paid_amount' => '净额必须填写',
@@ -72,8 +72,8 @@ class SdkOrderValidate extends Validate
      */
     protected $scene = [
         'save' => [
-            'orderid',
-            'cp_orderid',
+            'order_id',
+            'cp_order_id',
             'pay_channel',
             'money',
             'paid_amount',
@@ -95,8 +95,8 @@ class SdkOrderValidate extends Validate
             'product_name',
         ],
         'update' => [
-            'orderid',
-            'cp_orderid',
+            'order_id',
+            'cp_order_id',
             'pay_channel',
             'money',
             'paid_amount',

plugin/saiadmin/basic/BaseLogic.php

@@ -368,11 +368,13 @@ class BaseLogic
             // $data[$key]['package_name'] = !empty($packageList) ? $packageList[$value['package_id']] ?? '':'';
             $data[$key]['pay_channel_name'] = !empty($payChannelList) ? $payChannelList[$value['pay_channel_id']] ?? '':'';
 
-            $data[$key]['alipay_wap_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['alipay_wap']] ?? '':'';
-            $data[$key]['inapp_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['inapp']] ?? '':'';
-            $data[$key]['wechat_wap_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['wechat_wap']] ?? '':'';
-            $data[$key]['wechat_scan_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['wechat_scan']] ?? '':'';
-            $data[$key]['wechat_jsapi_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['wechat_jsapi']] ?? '':'';
+
+
+            $data[$key]['alipay_wap_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['alipay_wap']] ?? '-':'-';
+            $data[$key]['inapp_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['inapp']] ?? '-':'-';
+            $data[$key]['wechat_wap_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['wechat_wap']] ?? '-':'-';
+            $data[$key]['wechat_scan_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['wechat_scan']] ?? '-':'-';
+            $data[$key]['wechat_jsapi_name'] = !empty($gamePayChannelList) ? $gamePayChannelList[$value['wechat_jsapi']] ?? '-':'-';
             $data[$key]['ip'] = in_array('ip', $fields) ? $this->getIpLocation($value['ip']) : '';
         }
         return $data;