From 4460f8e7cf8c5ddcd20570c7fd5906873a4a141a Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 24 Jul 2020 10:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=93=E7=AE=97=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/GameController.class.php    |  5 ++++-
 Application/Admin/View/Game/add.html             | 16 ++++++++++++++++
 Application/Admin/View/Game/edit.html            | 16 ++++++++++++++++
 Data/update.sql                                  |  4 ++++
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index 48db52ec3..4d55b3771 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -281,6 +281,9 @@ class GameController extends ThinkController
             } else {
                 $_POST['display_site'] = '';
             }
+            $relation_game_id =  $_REQUEST['relation_game_id'];
+            $inv = D(self::model_name)->where("relation_game_id = '{$relation_game_id}'")->find();
+            $_POST['select_package_name'] = $inv['select_package_name'];
 
 
             $pinyin = new \Think\Pinyin();
@@ -431,7 +434,7 @@ class GameController extends ThinkController
             $phone['game_type_name'] = $sibling['game_type_name'];
             $phone['category'] = $sibling['category'];
             $phone['recommend_status'] = $sibling['recommend_status'];
-            //$phone['game_status']= $sibling['game_status'];
+            $phone['select_package_name']= $_POST['select_package_name'];
             $phone['sort'] = $sibling['sort'];
             $phone['game_score'] = $sibling['game_score'];
             $phone['features'] = $sibling['features'];
diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html
index c8c24e2bf..ab5c7e9ce 100644
--- a/Application/Admin/View/Game/add.html
+++ b/Application/Admin/View/Game/add.html
@@ -150,6 +150,22 @@
                                 <span class="notice-text">设置游戏的推荐类型，更改此游戏在网站所属的推荐板块；</span>
                             </td>
                         </tr>
+
+                        <tr>
+                            <td class="l noticeinfo">结算包名</td>
+                            <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label class="inp_radio">
+                                        <input type="radio" class="inp_radio" value="0" name="select_package_name" checked="checked"> 原包名
+                                    </label>
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="1" name="select_package_name" > 现包名
+                                    </label>
+                                </span>
+                                <span class="notice-text">用于上游结算时显示的游戏名称</span>
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l">游戏排序：</td>
                             <td class="r">
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html
index 4db4ca49f..a1facd9bc 100644
--- a/Application/Admin/View/Game/edit.html
+++ b/Application/Admin/View/Game/edit.html
@@ -175,6 +175,22 @@
                                 <span class="notice-text">设置游戏的推荐类型，更改此游戏在网站所属的推荐板块；</span>
                             </td>
                         </tr>
+
+                        <tr>
+                            <td class="l noticeinfo">推荐状态</td>
+                            <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="0" name="select_package_name" <eq name="data['select_package_name']" value="0">checked="checked"</eq>> 原包名
+                                    </label>
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="1" name="select_package_name" <eq name="data['select_package_name']" value="1">checked="checked"</eq>> 现包名
+                                    </label>
+                                </span>
+                                <span class="notice-text">用于上游结算时显示的游戏名称，修改后将同步关联游戏</span>
+                            </td>
+                        </tr>
+
                         <tr>
                             <td class="l">游戏排序：</td>
                             <td class="r">
diff --git a/Data/update.sql b/Data/update.sql
index a1bb79dad..9784407ca 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2237,4 +2237,8 @@ CREATE TABLE `tab_payment_member` (
 
 INSERT INTO `tab_payment_member` (`id`, `real_name`, `mobile`, `last_login_time`) VALUES ('1', '胡歌', '18959188422', '0')
 
+--chenzhi 游戏新增结算包名
+ALTER TABLE `tab_game` 
+ADD COLUMN `select_package_name` tinyint(2) NOT NULL DEFAULT 0 COMMENT '结算包名 0:原包名 1:现包名' AFTER `original_package_name`;
+