Merge branch 'release' of 47.111.118.107:wmtx/platform into feature/promote_order_settle_check

Application/Admin/Controller/ExportController.class.php

@@ -1135,6 +1135,11 @@ class ExportController extends Controller
                     unset($_REQUEST['pay_way']);
                 }
 
+                if (isset($_REQUEST['is_check'])) {
+                    $map['is_check'] = (int)($_REQUEST['is_check']);
+                    unset($_REQUEST['is_check']);
+                }
+
                 if ($_REQUEST['merchant_id']) {
                     $map['merchant_id'] = $_REQUEST['merchant_id'];
                     unset($_REQUEST['merchant_id']);
@@ -1229,6 +1234,7 @@ class ExportController extends Controller
                     'pay_way' => '充值方式',
                     'pay_status' => L('Order_status'),
                     'pay_game_status' => '游戏通知状态',
+                    'is_check' => '是否参与结算',
                     'promote_id' => "消费"."{$total}",
                 ];
 
@@ -1304,6 +1310,8 @@ class ExportController extends Controller
                         $value['sdk_version'] = $value['sdk_version'] == 1 ? "安卓" : "苹果";
                         $value['game_id'] = $thisGameInfo['partner_name'];
 
+                        $value['is_check'] = D("Spend")::IsCheckStr[$value['is_check']];
+
                         $value['company_name'] = $promoters[$value['promote_id']] == 0 ? '官方渠道' : ($companys[$promoters[$value['promote_id']]] ?? '');
                         unset($value['promote_id']);
                         $value['pay_time'] = date('Y-m-d H:i:s',$value['pay_time']);

Application/Admin/Controller/SpendController.class.php

@@ -11,10 +11,6 @@ use User\Api\UserApi as UserApi;
 class SpendController extends ThinkController
 {
     const model_name = 'Spend';
-    const IsCheckStr=[
-        "1"=>"是",
-        "2"=>"否"
-    ];
     public $OpAuthList;
 
     public function lists()
@@ -156,7 +152,7 @@ class SpendController extends ThinkController
         foreach ($data['data'] as $key=>&$value ) {
             ($value['promote_account']=='官方渠道')?($value['promote_account']=C('OFFICIEL_CHANNEL')):'';
             $value['market_admin_username'] = $adminUsernameList[$value['market_admin_id']] ?? '无';
-            $value['is_check_str'] = self::IsCheckStr[$value['is_check']];
+            $value['is_check_str'] = D(self::model_name)::IsCheckStr[$value['is_check']];
         }
         $this->assign('showMarketAdmin', session('user_auth')['show_market_admin']);
         $this->assign('showPromote', session('user_auth')['show_promote']);

Application/Admin/Model/SpendModel.class.php

@@ -22,6 +22,10 @@ class SpendModel extends Model
 
     /* 自动验证规则 */
     protected $_validate = array();
+    const IsCheckStr=[
+        "1"=>"是",
+        "2"=>"否"
+    ];
 
     /* 自动完成规则 */
     protected $_auto = array(