diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php
index b5e8dd326..0dee9cae9 100644
--- a/Application/Admin/Controller/MendController.class.php
+++ b/Application/Admin/Controller/MendController.class.php
@@ -60,7 +60,7 @@ class MendController extends ThinkController {
}
$data = M("Mend","tab_")
- ->field("user_account,promote_account,promote_account_to,order_time,create_time,op_account,remark")
+ ->field("user_account,promote_account,pay_amount,promote_account_to,order_time,create_time,op_account,remark")
->where($map)
->order("create_time desc");
@@ -75,7 +75,7 @@ class MendController extends ThinkController {
$data[$key]['order_time'] = date("Y-m-d H:i:s",$value['order_time']);
}
- if($export) db2csv($data,"推广员管理_推广补链_补链记录",["玩家账号","补链前渠道","补链后渠道","切分时间","补链时间","操作人员","备注"]);
+ if($export) db2csv($data,"推广员管理_推广补链_补链记录",["玩家账号","补链前渠道","补链前归属金额","补链后渠道","切分时间","补链时间","操作人员","备注"]);
if(IS_POST){
$page = set_pagination($_REQUEST['row_count'],$row);
diff --git a/Application/Admin/Controller/OldCountController.class.php b/Application/Admin/Controller/OldCountController.class.php
new file mode 100644
index 000000000..fd2d252eb
--- /dev/null
+++ b/Application/Admin/Controller/OldCountController.class.php
@@ -0,0 +1,42 @@
+1,
+ "pay_way"=>0
+ );
+ $GameSupersign = M("GameSupersign","tab_");
+ $dbres = $GameSupersign->field("id,trade_id")->where($map)->select();
+ $countdb = count($dbres);
+ if($countdb < 1){
+ die("No initialization required");
+ }
+ foreach ($dbres as $key => $value) {
+ $savedata = array(
+ "id"=>$value['id']
+ );
+ $tmp = (int)substr($value['trade_id'],0,4);
+ if($tmp > 3000){
+ $savedata['pay_way'] = 2; //微信
+ }else{
+ $savedata['pay_way'] = 1;//支付宝
+ }
+ $tres = $GameSupersign->save($savedata);
+ if($tres === false){
+ die("DB ERROR");
+ }
+ }
+ die("init ok");
+ }
+
+
+}
diff --git a/Application/Admin/View/Mend/recordList.html b/Application/Admin/View/Mend/recordList.html
index aae3ab3a4..a1894695c 100644
--- a/Application/Admin/View/Mend/recordList.html
+++ b/Application/Admin/View/Mend/recordList.html
@@ -70,6 +70,7 @@
玩家账号 |
补链前渠道 |
+ 补链前归属金额 |
补链后渠道 |
备注 |
切分时间 |
@@ -88,6 +89,7 @@
|
{$data['user_account']} |
{$data['promote_account']} |
+ {$data['pay_amount']} |
{$data['promote_account_to']} |
@@ -129,6 +131,7 @@
| |
${item['user_account']} |
${item['promote_account']} |
+ ${item['pay_amount']} |
${item['promote_account_to']} |
diff --git a/Application/Callback/Controller/BaseController.class.php b/Application/Callback/Controller/BaseController.class.php
index 25d79dbc5..9009b717c 100644
--- a/Application/Callback/Controller/BaseController.class.php
+++ b/Application/Callback/Controller/BaseController.class.php
@@ -246,7 +246,8 @@ class BaseController extends Controller {
'pay_status' => 0,
))->save(array(
'trade_id' => $data['trade_id'],
- 'pay_status' => 1,
+ 'pay_status' => 1,
+ 'pay_way'=>$data['pay_way'],
'pay_time' => time()
));
if (!$r) return -1;
diff --git a/Application/Callback/Controller/Notify2Controller.class.php b/Application/Callback/Controller/Notify2Controller.class.php
index 4e196c26c..41267e8b2 100644
--- a/Application/Callback/Controller/Notify2Controller.class.php
+++ b/Application/Callback/Controller/Notify2Controller.class.php
@@ -69,7 +69,8 @@ class Notify2Controller extends BaseController
case 'SS': // 超级签
$this->supersign_pay_notify(array(
'trade_id' => $order_info['trade_no'],
- 'order_id' => $order_info['out_trade_no']
+ 'order_id' => $order_info['out_trade_no'],
+ 'pay_way'=>1
));
break;
default:
diff --git a/Application/Callback/Controller/NotifyController.class.php b/Application/Callback/Controller/NotifyController.class.php
index 92702f202..c8e58fa47 100644
--- a/Application/Callback/Controller/NotifyController.class.php
+++ b/Application/Callback/Controller/NotifyController.class.php
@@ -221,7 +221,8 @@ class NotifyController extends BaseController
$out_trade_no = $Swiftpass->resHandler->getParameter('out_trade_no');
$this->supersign_pay_notify(array(
'trade_id' => $trade_no,
- 'order_id' => $out_trade_no
+ 'order_id' => $out_trade_no,
+ 'pay_way'=>2
));
echo 'success';
}else{
diff --git a/Data/update.sql b/Data/update.sql
index 4c9cac958..c968ea225 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -696,3 +696,6 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0'
ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` int(11) DEFAULT '0' COMMENT '玩家游戏内id';
ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 ';
ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号';
+
+--2019-12-11 超级签新增充值方式 chenzhi
+ALTER TABLE `tab_game_supersign` ADD COLUMN `pay_way` tinyint(2) DEFAULT '0' COMMENT '充值方式(0:未知,1:支付宝,2:微信)' AFTER `pay_time`;
\ No newline at end of file
|