市场业绩提交

Application/Admin/Controller/TimingController.class.php

@@ -1023,9 +1023,9 @@ class TimingController extends AdminController {
             ->where($belong_map)
             ->select();
 
-        if($belong_game) {
+//        if($belong_game) {
-            unset($spend_map['pay_time']);
+//            unset($spend_map['pay_time']);
-        }
+//        }
         $unsettlement = $spend_map;
         foreach ($belong_game as $key => $value) {
 
@@ -1170,7 +1170,7 @@ class TimingController extends AdminController {
 //            ->where(['company_id'=>313,'spend.promote_id'=>4359,'relation_game_id'=>191])
 //            ->order("is_settlement ASC")
             ->select();
-
+//        dump($promote_data);die();
         $specialPayAmount = [];
 
         $unsettlement_amount = [];

Data/update.sql

@@ -2684,7 +2684,8 @@ ADD COLUMN `is_settlement` tinyint(2) NULL DEFAULT 0 COMMENT '是否结算' AFTE
 CREATE TABLE `tab_company_belong_game`  (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `game_ids` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '外团推广关联游戏的数据',
-  `time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '选择时间',
+  `begin_time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '起始时间',
+  `end_time` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '结束时间',
   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;