瀏覽代碼

修改角球赛事赔率

Your Name 6 年之前
父節點
當前提交
5bed218524
共有 3 個文件被更改,包括 26 次插入853 次删除
  1. 22 29
      hg3535/.idea/workspace.xml
  2. 2 416
      hg3535/pipeline/roll_zuqiu.py
  3. 2 408
      hg3535/pipeline/zuqiu.py

+ 22 - 29
hg3535/.idea/workspace.xml

@@ -58,8 +58,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5228">
-              <caret line="574" column="43" lean-forward="true" selection-start-line="574" selection-start-column="43" selection-end-line="574" selection-end-column="43" />
+            <state relative-caret-position="688">
+              <caret line="585" column="67" selection-start-line="585" selection-start-column="67" selection-end-line="585" selection-end-column="67" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
               </folding>
@@ -70,11 +70,10 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2042">
-              <caret line="1029" column="25" lean-forward="true" selection-start-line="1029" selection-start-column="25" selection-end-line="1029" selection-end-column="25" />
+            <state relative-caret-position="1341">
+              <caret line="68" column="59" selection-start-line="68" selection-start-column="59" selection-end-line="68" selection-end-column="59" />
               <folding>
                 <element signature="e#18#33#0" expanded="true" />
-                <element signature="e#37161#37176#0" />
               </folding>
             </state>
           </provider>
@@ -169,7 +168,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>odds_onlys</find>
       <find>fuhao</find>
       <find>足球滚球联赛提交失败</find>
       <find>data_list</find>
@@ -199,6 +197,7 @@
       <find>成功</find>
       <find>match_id</find>
       <find>score_full</find>
+      <find>odds_onlys</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -663,14 +662,7 @@
       <workItem from="1570519445273" duration="3553000" />
       <workItem from="1570599083340" duration="129000" />
       <workItem from="1570605476233" duration="2322000" />
-      <workItem from="1570609094756" duration="543000" />
-    </task>
-    <task id="LOCAL-00052" summary="更新篮球, 父级玩法错误">
-      <created>1567844689680</created>
-      <option name="number" value="00052" />
-      <option name="presentableId" value="LOCAL-00052" />
-      <option name="project" value="LOCAL" />
-      <updated>1567844689680</updated>
+      <workItem from="1570609094756" duration="1019000" />
     </task>
     <task id="LOCAL-00053" summary="更新篮球, 父级玩法错误">
       <created>1567994111422</created>
@@ -1008,11 +1000,18 @@
       <option name="project" value="LOCAL" />
       <updated>1570607142521</updated>
     </task>
-    <option name="localTasksCounter" value="101" />
+    <task id="LOCAL-00101" summary="修改角球赛事赔率">
+      <created>1570609662734</created>
+      <option name="number" value="00101" />
+      <option name="presentableId" value="LOCAL-00101" />
+      <option name="project" value="LOCAL" />
+      <updated>1570609662734</updated>
+    </task>
+    <option name="localTasksCounter" value="102" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="2042704000" />
+    <option name="totallyTimeSpent" value="2043180000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1125,7 +1124,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="修改冠军,导入错误" />
     <MESSAGE value="修改棒球,联赛无法写入" />
     <MESSAGE value="修改冠军,联赛url" />
     <MESSAGE value="不启用,scrapy_deltafetch" />
@@ -1150,7 +1148,8 @@
     <MESSAGE value="修改赛果球队名错误" />
     <MESSAGE value="更改返回错误状态码" />
     <MESSAGE value="修改网球赛果提交错误" />
-    <option name="LAST_COMMIT_MESSAGE" value="修改网球赛果提交错误" />
+    <MESSAGE value="修改角球赛事赔率" />
+    <option name="LAST_COMMIT_MESSAGE" value="修改角球赛事赔率" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1162,7 +1161,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/zuqiu.py</url>
-          <line>204</line>
+          <line>200</line>
           <option name="timeStamp" value="65" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
@@ -1200,11 +1199,6 @@
           <line>237</line>
           <option name="timeStamp" value="252" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/roll_zuqiu.py</url>
-          <line>652</line>
-          <option name="timeStamp" value="258" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
           <line>208</line>
@@ -1670,19 +1664,18 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2042">
-          <caret line="1029" column="25" lean-forward="true" selection-start-line="1029" selection-start-column="25" selection-end-line="1029" selection-end-column="25" />
+        <state relative-caret-position="1341">
+          <caret line="68" column="59" selection-start-line="68" selection-start-column="59" selection-end-line="68" selection-end-column="59" />
           <folding>
             <element signature="e#18#33#0" expanded="true" />
-            <element signature="e#37161#37176#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="5228">
-          <caret line="574" column="43" lean-forward="true" selection-start-line="574" selection-start-column="43" selection-end-line="574" selection-end-column="43" />
+        <state relative-caret-position="688">
+          <caret line="585" column="67" selection-start-line="585" selection-start-column="67" selection-end-line="585" selection-end-column="67" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
           </folding>

+ 2 - 416
hg3535/pipeline/roll_zuqiu.py

@@ -67,8 +67,6 @@ class Roll_Zuqiupipeline(object):
             if res:
                 if res.get('status') == 1:
                     self.db.zq_league35.insert(league_data)
-                    # self.db.zq_league35.update({'lg_id': league_id}, {'$set': league_data},
-                    #                                 upsert=True)
                     logger.info('足球滚球联赛提交成功, {}'.format(res))
                     logger.info(league_dict)
                 else:
@@ -95,8 +93,6 @@ class Roll_Zuqiupipeline(object):
             if res:
                 if res.get('status') == 1:
                     self.db.zq_competition35.insert(match_data)
-                    # self.db.zq_competition35.update({'match_id': match_id, 'is_rollball': 1}, {'$set': match_data},
-                    #                                 upsert=True)
                     logger.info('足球滚球赛事提交成功, {}'.format(res))
                     logger.info(match_data)
                 else:
@@ -115,7 +111,6 @@ class Roll_Zuqiupipeline(object):
         half_size_home_rule = item["half_size_home_rule"]
         data_list = []
         odds_onlys = []
-
         # half_size_guest
         for index, value in enumerate(half_size_guest):
             hash_str = p_code + "gss_h" + str(index) + str(half_size_guest_rule[index]) + str(
@@ -581,25 +576,6 @@ class Roll_Zuqiupipeline(object):
                     logger.warning(r_data_dict)
             except Exception as e:
                 logger.warning('滚球数据接口异常,提交失败, {}'.format(e))
-        # status_dict = {"game_code": 'zq', "title": "match_status", "source": "hg3535"}
-        # data_list = []
-        # data = {'match_id': match_id, 'status': 1, "is_rollball": 0, "is_today": 0, "is_morningplate": 0,
-        #         "is_stringscene": 0, "is_horn": 0}
-        # data_list.append(data)
-        # status_dict['data'] = data_list
-        # res = Helper.async_post(MATCH_STATUS, status_dict)
-        # if res:
-        #     if res.get('status') == 1:
-        #         self.db.match_status35.insert(status_dict)
-        #         logger.info('{},赛事结果状态交成功, {}'.format('zq', res))
-        #         logger.info(status_dict)
-        #     else:
-        #         logger.warning('{},赛事结果状态交失败, {}'.format('zq', res))
-        #         logger.warning(status_dict)
-        # else:
-        #     logger.warning('{},赛事结果状态接口异常提交失败, {}'.format('zq', res))
-        #     logger.warning(status_dict)
-
         #   角球分割处理--------------------------------------------------------------------------------------------------
         if horn_team:
             team_home = horn_team['horn_home']
@@ -625,8 +601,6 @@ class Roll_Zuqiupipeline(object):
                 if res:
                     if res.get('status') == 1:
                         self.db.zq_competition35.insert(match_data)
-                        # self.db.zq_competition35.update({'match_id': match_id, 'is_rollball': 1}, {'$set': match_data},
-                        #                                 upsert=True)
                         logger.info('足球滚球角球, 赛事提交成功, {}'.format(res))
                         logger.info(match_data)
                     else:
@@ -637,396 +611,8 @@ class Roll_Zuqiupipeline(object):
                     logger.warning(match_data)
             else:
                 logger.info('足球滚球赛事已存在, 不提交')
-            # p_code = "GS"
-            # # 构建唯一索引
-            # half_size_guest = item["half_size_guest"]
-            # half_size_guest_rule = item["half_size_guest_rule"]
-            # half_size_home = item["half_size_home"]
-            # half_size_home_rule = item["half_size_home_rule"]
-            # data_list = []
-            # odds_onlys = []
-            #
-            # # half_size_guest
-            # for index, value in enumerate(half_size_guest):
-            #     hash_str = p_code + "gss_h" + str(index) + str(half_size_guest_rule[index]) + str(
-            #         value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + "gss_h" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     half_size_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                            "odds_only", "sole", "source", "type", "team"]
-            #     condition = half_size_guest_rule[index]
-            #     half_size_guest_value = [match_id, league_id, "gss_h", "0", index, p_code, value, condition,
-            #                              odds_only, sole, "hg3535", "0", ""]
-            #     half_size_guest_data = dict(zip(half_size_guest_key, half_size_guest_value))
-            #     data_list.append(half_size_guest_data)
-            #
-            # # half_size_home
-            # for index, value in enumerate(half_size_home):
-            #     hash_str = p_code + "gsb_h" + str(index) + str(half_size_home_rule[index]) + str(
-            #         value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + "gsb_h" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     half_size_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                           "odds_only", "sole", "source", "type", "team"]
-            #     condition = half_size_home_rule[index]
-            #     half_size_home_value = [match_id, league_id, "gsb_h", "0", index, p_code, value, condition,
-            #                             odds_only, sole, "hg3535", "0", ""]
-            #     half_size_home_data = dict(zip(half_size_home_key, half_size_home_value))
-            #     data_list.append(half_size_home_data)
-            #
-            # # 全场场大小
-            # size_guest = item["size_guest"]
-            # size_guest_rule = item["size_guest_rule"]
-            # size_home = item["size_home"]
-            # size_home_rule = item["size_home_rule"]
-            # # size_home
-            # for index, value in enumerate(size_home):
-            #     hash_str = p_code + "gsb" + str(index) + str(size_home_rule[index]) + str(value) + "hg3535" + str(
-            #         match_id)
-            #     sole_str = p_code + "gsb" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     size_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                      "odds_only", "sole", "source", "type", "team"]
-            #     condition = size_home_rule[index]
-            #     size_home_value = [match_id, league_id, "gsb", "0", index, p_code, value, condition, odds_only,
-            #                        sole, "hg3535", "0", ""]
-            #     size_home_data = dict(zip(size_home_key, size_home_value))
-            #     data_list.append(size_home_data)
-            #
-            # # size_guest
-            # for index, value in enumerate(size_guest):
-            #     hash_str = p_code + "gss" + str(index) + str(size_guest_rule[index]) + str(value) + "hg3535" + str(
-            #         match_id)
-            #     sole_str = p_code + "gss" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     size_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                       "odds_only", "sole", "source", "type", "team"]
-            #     condition = size_guest_rule[index]
-            #     size_guest_value = [match_id, league_id, "gss", "0", index, p_code, value, condition, odds_only,
-            #                         sole, "hg3535", "0", ""]
-            #     size_home_data = dict(zip(size_guest_key, size_guest_value))
-            #     data_list.append(size_home_data)
-            #
-            # p_code = 'CO'
-            # half_concede_home_rule = item["half_concede_home_rule"]
-            # half_concede_home = item["half_concede_home"]
-            # half_concede_guest_rule = item["half_concede_guest_rule"]
-            # half_concede_guest = item["half_concede_guest"]
-            # # half_concede_home
-            # for index, value in enumerate(half_concede_guest):
-            #     hash_str = p_code + "cog_h" + str(index) + str(half_concede_guest_rule[index]) + str(
-            #         value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + "cog_h" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     half_concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                               "odds_only", "sole", "source", "type", "team"]
-            #     condition = half_concede_guest_rule[index]
-            #     half_concede_guest_value = [match_id, league_id, "cog_h", "0", index, p_code, value, condition,
-            #                                 odds_only, sole, "hg3535", "0", ""]
-            #     half_concede_guest_data = dict(zip(half_concede_guest_key, half_concede_guest_value))
-            #     data_list.append(half_concede_guest_data)
-            #
-            # # half_concede_home
-            # for index, value in enumerate(half_concede_home):
-            #     hash_str = p_code + "coh_h" + str(index) + str(half_concede_home_rule[index]) + str(
-            #         value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + "coh_h" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     half_concede_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                              "odds_only", "sole", "source", "type", "team"]
-            #     condition = half_concede_home_rule[index]
-            #     half_concede_home_value = [match_id, league_id, "coh_h", "0", index, p_code, value, condition,
-            #                                odds_only, sole, "hg3535", "0", ""]
-            #     half_concede_home_data = dict(zip(half_concede_home_key, half_concede_home_value))
-            #     data_list.append(half_concede_home_data)
-            #
-            # concede_guest = item["concede_guest"]
-            # concede_guest_rule = item["concede_guest_rule"]
-            # concede_home = item["concede_home"]
-            # concede_home_rule = item["concede_home_rule"]
-            # # concede_guest
-            # for index, value in enumerate(concede_guest):
-            #     hash_str = p_code + "cog" + str(index) + str(concede_guest_rule[index]) + str(
-            #         value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + "cog" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                          "odds_only", "sole", "source", "type", "team"]
-            #     condition = concede_guest_rule[index]
-            #     concede_guest_value = [match_id, league_id, "cog", "0", index, p_code, value, condition,
-            #                            odds_only, sole, "hg3535", "0", ""]
-            #     concede_guest_data = dict(zip(concede_guest_key, concede_guest_value))
-            #     data_list.append(concede_guest_data)
-            #
-            # # concede_home
-            # for index, value in enumerate(concede_home):
-            #     hash_str = p_code + "coh" + str(index) + str(concede_home_rule[index]) + str(
-            #         value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + "coh" + str(index) + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     concede_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                         "odds_only", "sole", "source", "type", "team"]
-            #     condition = concede_home_rule[index]
-            #     concede_home_value = [match_id, league_id, "coh", "0", index, p_code, value, condition, odds_only,
-            #                           sole, "hg3535", "0", ""]
-            #     concede_guest_data = dict(zip(concede_home_key, concede_home_value))
-            #     data_list.append(concede_guest_data)
-            #
-            # # 独赢-------------------------------------------------------------------------------------------------------
-            # p_code = 'C'
-            # half_capot_home = item["half_capot_home"]
-            # half_capot_guest = item["half_capot_guest"]
-            # half_capot_dogfall = item["half_capot_dogfall"]
-            # capot_home = item["capot_home"]
-            # capot_guest = item["capot_guest"]
-            # capot_dogfall = item["capot_dogfall"]
-            #
-            # # half_capot_home
-            # hash_str = p_code + "ch_h" + '0' + '1' + str(half_capot_home) + "hg3535" + str(match_id)
-            # sole_str = p_code + "ch_h" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # half_capot_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                        "odds_only", "sole", "source", "type", "team"]
-            # half_capot_home_value = [match_id, league_id, "ch_h", "0", 0, p_code, half_capot_home, '1',
-            #                          odds_only, sole, "hg3535", "0", ""]
-            # half_capot_homet_data = dict(zip(half_capot_home_key, half_capot_home_value))
-            # data_list.append(half_capot_homet_data)
-            #
-            # # half_capot_guest
-            # hash_str = p_code + "cg_h" + '0' + '2' + str(half_capot_guest) + "hg3535" + str(match_id)
-            # sole_str = p_code + "cg_h" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # half_capot_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                         "odds_only", "sole", "source", "type", "team"]
-            # half_capot_guest_value = [match_id, league_id, "cg_h", "0", 0, p_code, half_capot_guest, '2',
-            #                           odds_only, sole, "hg3535", "0", ""]
-            # half_capot_guest_data = dict(zip(half_capot_guest_key, half_capot_guest_value))
-            # data_list.append(half_capot_guest_data)
-            #
-            # # half_capot_dogfall
-            # hash_str = p_code + "cd_h" + '0' + 'X' + str(half_capot_dogfall) + "hg3535" + str(match_id)
-            # sole_str = p_code + "cd_h" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # half_capot_dogfall_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                           "odds_only", "sole", "source", "type", "team"]
-            # half_capot_dogfall_value = [match_id, league_id, "cd_h", "0", 0, p_code, half_capot_dogfall, 'X',
-            #                             odds_only, sole, "hg3535", "0", ""]
-            # half_capot_dogfall_data = dict(zip(half_capot_dogfall_key, half_capot_dogfall_value))
-            # data_list.append(half_capot_dogfall_data)
-            # # capot_dogfall
-            # hash_str = p_code + "cd" + '0' + 'X' + str(capot_dogfall) + "hg3535" + str(match_id)
-            # sole_str = p_code + "cd" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # capot_dogfall_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                      "odds_only", "sole", "source", "type", "team"]
-            # capot_dogfall_value = [match_id, league_id, "cd", "0", 0, p_code, capot_dogfall, 'X', odds_only,
-            #                        sole, "hg3535", "0", ""]
-            # capot_dogfall_data = dict(zip(capot_dogfall_key, capot_dogfall_value))
-            # data_list.append(capot_dogfall_data)
-            #
-            # # capot_home
-            # hash_str = p_code + "ch" + '0' + '1' + str(capot_home) + "hg3535" + str(match_id)
-            # sole_str = p_code + "ch" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # capot_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                   "odds_only", "sole", "source", "type", "team"]
-            # capot_home_value = [match_id, league_id, "ch", "0", 0, p_code, capot_home, '1',
-            #                     odds_only, sole, "hg3535", "0", ""]
-            # capot_homet_data = dict(zip(capot_home_key, capot_home_value))
-            # data_list.append(capot_homet_data)
-            #
-            # # capot_guest
-            # hash_str = p_code + "cg" + '0' + '2' + str(capot_guest) + "hg3535" + str(match_id)
-            # sole_str = p_code + "cg" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # capot_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                    "odds_only", "sole", "source", "type", "team"]
-            # capot_guest_value = [match_id, league_id, "cg", "0", 0, p_code, capot_guest, '2',
-            #                      odds_only, sole, "hg3535", "0", ""]
-            # capot_guest_data = dict(zip(capot_guest_key, capot_guest_value))
-            # data_list.append(capot_guest_data)
-            #
-            # # 入球数单双--------------------------------------------------------------------------------------------------
-            # p_code = 'TS'
-            # odd_even_odd = item["odd_even_odd"]
-            # odd_even_even = item["odd_even_even"]
-            # half_odd_even_odd = item["half_odd_even_odd"]
-            # half_odd_even_even = item["half_odd_even_even"]
-            #
-            # # odd_even_odd
-            # hash_str = p_code + "tss" + '0' + '单' + str(odd_even_odd) + "hg3535" + str(match_id)
-            # sole_str = p_code + "tss" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # single_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #               "odds_only", "sole", "source", "type", "team"]
-            # single_value = [match_id, league_id, "tss", "0", 0, p_code, odd_even_odd, '单',
-            #                 odds_only, sole, "hg3535", "0", ""]
-            # single_data = dict(zip(single_key, single_value))
-            # data_list.append(single_data)
-            #
-            # # odd_even_even
-            # hash_str = p_code + "tsd" + '0' + '双' + str(odd_even_even) + "hg3535" + str(match_id)
-            # sole_str = p_code + "tsd" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # double_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #               "odds_only", "sole", "source", "type", "team"]
-            # double_value = [match_id, league_id, "tsd", "0", 0, p_code, odd_even_even, '双',
-            #                 odds_only, sole, "hg3535", "0", ""]
-            # double_data = dict(zip(double_key, double_value))
-            # data_list.append(double_data)
-            #
-            # # half_odd_even_even
-            # hash_str = p_code + "tsd_h" + '0' + '双' + str(half_odd_even_even) + "hg3535" + str(match_id)
-            # sole_str = p_code + "tsd_h" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # half_double_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                    "odds_only", "sole", "source", "type", "team"]
-            # half_double_value = [match_id, league_id, "tsd_h", "0", 0, p_code, half_odd_even_even, '双',
-            #                      odds_only, sole, "hg3535", "0", ""]
-            # half_double_data = dict(zip(half_double_key, half_double_value))
-            # data_list.append(half_double_data)
-            #
-            # # half_odd_even_odd
-            # hash_str = p_code + "tss_h" + '0' + '单' + str(half_odd_even_odd) + "hg3535" + str(match_id)
-            # sole_str = p_code + "tss_h" + '0' + str(match_id) + "hg3535"
-            # odds_only = Helper.genearte_MD5(hash_str, pt)
-            # sole = Helper.genearte_MD5(sole_str, pt)
-            # half_single_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                    "odds_only", "sole", "source", "type", "team"]
-            # half_single_value = [match_id, league_id, "tss_h", "0", 0, p_code, half_odd_even_odd, '单', odds_only,
-            #                      sole, "hg3535", "0", ""]
-            # half_single_data = dict(zip(half_single_key, half_single_value))
-            # data_list.append(half_single_data)
-            #
-            # p_code = 'TG'
-            # # 总入球数 ---------------------------------------------------------------------------------------------------
-            # total_goals = item['total_goal']
-            # total_dict = {'tg0': '0-1', 'tg1': '2-3', 'tg2': '4-6', 'tg3': '7或以上', 'tg0_h': '0', "tg1_h": '1',
-            #               "tg2_h": '2', "tg3_h": '3或以上'}
-            # # 全场入球数 单双
-            # for key, value in total_goals.items():
-            #     hash_str = p_code + key + '0' + total_dict[key] + str(value) + "hg3535" + str(match_id)
-            #     sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-            #     odds_only = Helper.genearte_MD5(hash_str, pt)
-            #     sole = Helper.genearte_MD5(sole_str, pt)
-            #     total_goals_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                        "odds_only", "sole", "source", "type", "team"]
-            #     total_goals_value = [match_id, league_id, key, "0", 0, p_code, value, total_dict[key], odds_only,
-            #                          sole, "hg3535", "0", ""]
-            #     total_goals_data = dict(zip(total_goals_key, total_goals_value))
-            #     data_list.append(total_goals_data)
-            #
-            # # 全场半场 ---------------------------------------------------------------------------------------------------
-            # half_fulls = item['half_full']
-            # # p_code, p_id = get_pcode(corner_ball, 'half_full')
-            # p_code = 'HF'
-            # full_dict = {"hfhh": "主主", "hfhd": "主和", "hfhg": "主客", "hfdh": "和主",
-            #              "hfdd": "和和", "hfdg": "和客", "hfgh": "客主", "hfgd": "客和", "hfgg": "客客"}
-            # if half_fulls:
-            #     for key, value in half_fulls.items():
-            #         hash_str = p_code + key + '0' + full_dict[key] + str(value) + "hg3535" + str(match_id)
-            #         sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-            #         odds_only = Helper.genearte_MD5(hash_str, pt)
-            #         sole = Helper.genearte_MD5(sole_str, pt)
-            #         half_fulls_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                           "odds_only", "sole", "source", "type", "team"]
-            #         half_fulls_value = [match_id, league_id, key, "0", 0, p_code, value, full_dict[key], odds_only,
-            #                             sole, "hg3535", "0", ""]
-            #         half_fulls_data = dict(zip(half_fulls_key, half_fulls_value))
-            #         data_list.append(half_fulls_data)
-            #
-            # # 波胆-------------------------------------------------------------------------------------------------------
-            # p_code = 'B'
-            # bodan_datas = item['bodan_data']
-            # # p_code, p_id = get_pcode(corner_ball, 'bodan')
-            # bodan_dict = {"b10": "1-0", "b20": "2-0", "b21": "2-1", "b30": "3-0", "b31": "3-1", "b32": "3-2",
-            #               "b40": "4-0", "b41": "4-1", "b42": "4-2", "b43": "4-3", "b01": "0-1", "b02": "0-2",
-            #               "b12": "1-2", "b03": "0-3", "b13": "1-3", "b23": "2-3", "b04": "0-4", "b14": "1-4",
-            #               "b24": "2-4", "b34": "3-4", "b00": "0-0", "b11": "1-1", "b22": "2-2", "b33": "3-3",
-            #               "b44": "4-4", "bo": "其他", "b10_h": "1-0", "b20_h": "2-0", "b21_h": "2-1", "b30_h": "3-0",
-            #               "b31_h": "3-1", "b32_h": "3-2", "b01_h": "0-1", "b02_h": "0-2", "b12_h": "1-2", "b03_h": "0-3",
-            #               "b13_h": "1-3", "b23_h": "2-3", "b00_h": "0-0", "b11_h": "1-1", "b22_h": "2-2", "b33_h": "3-3",
-            #               "bo_h": "其他"}
-            # if bodan_datas:
-            #     for key, value in bodan_datas.items():
-            #         hash_str = p_code + key + '0' + bodan_dict[key] + str(value) + "hg3535" + str(match_id)
-            #         sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-            #         odds_only = Helper.genearte_MD5(hash_str, pt)
-            #         sole = Helper.genearte_MD5(sole_str, pt)
-            #         bodan_dict_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-            #                           "odds_only", "sole", "source", "type", "team"]
-            #         bodan_dict_value = [match_id, league_id, key, "0", 0, p_code, value, bodan_dict[key], odds_only,
-            #                             sole, "hg3535", "0", ""]
-            #         bodan_dict_data = dict(zip(bodan_dict_key, bodan_dict_value))
-            #         data_list.append(bodan_dict_data)
-            #
-            # # 最先进球/最后进球 -------------------------------------------------------------------------------------------
-            # first_last_balls = item['first_last_ball']
-            # p_code = 'FLB'
-            # first_last_dict = {"flbfh": "最先进球", "flbfg": "最先进球", "flblh": "最后进球", "flblg": "最后进球", "flbn": "没有进球"}
-            # if first_last_balls:
-            #     for key, value in first_last_balls.items():
-            #         hash_str = p_code + key + '0' + first_last_dict[key] + str(value) + "hg3535" + str(match_id)
-            #         sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-            #         odds_only = Helper.genearte_MD5(hash_str, pt)
-            #         sole = Helper.genearte_MD5(sole_str, pt)
-            #         first_last_balls_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-            #                                 "condition",
-            #                                 "odds_only", "sole", "source", "type", "team"]
-            #         first_last_balls_value = [match_id, league_id, key, "0", 0, p_code, value, first_last_dict[key],
-            #                                   odds_only,
-            #                                   sole, "hg3535", "0", ""]
-            #         first_last_balls_data = dict(zip(first_last_balls_key, first_last_balls_value))
-            #         data_list.append(first_last_balls_data)
-            #
-            # p_code = 'TB'
-            # # 球队得分全场,上半场
-            # full_dicts = item['full_data']
-            # half_dicts = item['half_data']
-            # full_dict_rules = item['full_data_rule']
-            # half_dict_rules = item['half_data_rule']
-            # if full_dicts:
-            #     for key, value in full_dicts.items():
-            #         hash_str = p_code + key + '0' + full_dict_rules[key] + str(value) + "hg3535" + str(match_id)
-            #         sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-            #         odds_only = Helper.genearte_MD5(hash_str, pt)
-            #         sole = Helper.genearte_MD5(sole_str, pt)
-            #         full_dict_rules_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-            #                                "condition", "odds_only", "sole", "source", "type", "team"]
-            #         full_dict_rules_value = [match_id, league_id, key, "0", 0, p_code, value, full_dict_rules[key],
-            #                                  odds_only, sole, "hg3535", "0", ""]
-            #         full_dict_rules_data = dict(zip(full_dict_rules_key, full_dict_rules_value))
-            #         data_list.append(full_dict_rules_data)
-            #
-            # if half_dicts:
-            #     for key, value in half_dicts.items():
-            #         hash_str = p_code + key + '0' + half_dict_rules[key] + str(value) + "hg3535" + str(match_id)
-            #         sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-            #         odds_only = Helper.genearte_MD5(hash_str, pt)
-            #         sole = Helper.genearte_MD5(sole_str, pt)
-            #         half_dicts_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-            #                           "condition", "odds_only", "sole", "source", "type", "team"]
-            #         half_dicts_value = [match_id, league_id, key, "0", 0, p_code, value, half_dict_rules[key],
-            #                             odds_only, sole, "hg3535", "0", ""]
-            #         half_dicts_data = dict(zip(half_dicts_key, half_dicts_value))
-            #         data_list.append(half_dicts_data)
+            data_list = []
+            odds_onlys = []
             p_code = 'CB'
             horn_ou_dict = item['horn_ou_dict']
             horn_ou_dict_rule = item['horn_ou_dict_rule']

+ 2 - 408
hg3535/pipeline/zuqiu.py

@@ -74,8 +74,6 @@ class Zuqiupipeline(object):
             if res:
                 if res.get('status') == 1:
                     self.db.zq_league35.insert(league_data)
-                    # self.db.zq_league35.update({'lg_id': league_id}, {'$set': league_data},
-                    #                                 upsert=True)
             else:
                 logging.warning('足球详细赔率接口异常, {}'.format(res))
         else:
@@ -113,8 +111,6 @@ class Zuqiupipeline(object):
             if res:
                 if res.get('status') == 1:
                     self.db.zq_competition35.insert(match_data)
-                    # self.db.zq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data},
-                    #                                 upsert=True)
                 else:
                     logger.warning('足球赛事表提交失败, {}'.format(res))
                     logger.warning(match_dict)
@@ -588,8 +584,6 @@ class Zuqiupipeline(object):
                 if res:
                     if res.get('status') == 1:
                         self.db.zq_competition35.insert(match_data)
-                        # self.db.zq_competition35.update({'match_id': match_id, pt_status: 1}, {'$set': match_data},
-                        #                                 upsert=True)
                         logger.info('足球角球, 赛事表提交失败, {}'.format(res))
                         logger.info(match_dict)
                     else:
@@ -600,408 +594,8 @@ class Zuqiupipeline(object):
                     logger.warning(match_dict)
             else:
                 logger.info('足球角球, 赛事已存在,不提交')
-        #
-        #     p_code = "GS"
-        #     half_size_guest = item["half_size_guest"]
-        #     half_size_guest_rule = item["half_size_guest_rule"]
-        #     half_size_home = item["half_size_home"]
-        #     half_size_home_rule = item["half_size_home_rule"]
-        #     data_list = []
-        #     odds_onlys = []
-        #     # half_size_guest
-        #     for index, value in enumerate(half_size_guest):
-        #         hash_str = p_code + "gss_h" + str(index) + str(half_size_guest_rule[index]) + str(
-        #             value) + "hg3535" + str(match_id)
-        #         sole_str = p_code + "gss_h" + str(index) + str(match_id) + "hg3535"
-        #         odds_only = Helper.genearte_MD5(hash_str, pt)
-        #         sole = Helper.genearte_MD5(sole_str, pt)
-        #         half_size_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                "condition",
-        #                                "odds_only", "sole", "source", "type", "team"]
-        #         condition = half_size_guest_rule[index]
-        #         half_size_guest_value = [match_id, league_id, "gss_h", "0", index, p_code, value, condition,
-        #                                  odds_only, sole, "hg3535", "0", ""]
-        #         half_size_guest_data = dict(zip(half_size_guest_key, half_size_guest_value))
-        #         data_list.append(half_size_guest_data)
-        #     # half_size_home
-        #     for index, value in enumerate(half_size_home):
-        #         hash_str = p_code + "gsb_h" + str(index) + str(half_size_home_rule[index]) + str(
-        #             value) + "hg3535" + str(match_id)
-        #         sole_str = p_code + "gsb_h" + str(index) + str(match_id) + "hg3535"
-        #         odds_only = Helper.genearte_MD5(hash_str, pt)
-        #         sole = Helper.genearte_MD5(sole_str, pt)
-        #         half_size_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                               "odds_only", "sole", "source", "type", "team"]
-        #         condition = half_size_home_rule[index]
-        #         half_size_home_value = [match_id, league_id, "gsb_h", "0", index, p_code, value, condition,
-        #                                 odds_only, sole, "hg3535", "0", ""]
-        #         half_size_home_data = dict(zip(half_size_home_key, half_size_home_value))
-        #         data_list.append(half_size_home_data)
-        #
-        #     # 全场场大小
-        #     size_guest = item["size_guest"]
-        #     size_guest_rule = item["size_guest_rule"]
-        #     size_home = item["size_home"]
-        #     size_home_rule = item["size_home_rule"]
-        #     # size_home
-        #     for index, value in enumerate(size_home):
-        #         hash_str = p_code + "gsb" + str(index) + str(size_home_rule[index]) + str(value) + "hg3535" + str(
-        #             match_id)
-        #         sole_str = p_code + "gsb" + str(index) + str(match_id) + "hg3535"
-        #         odds_only = Helper.genearte_MD5(hash_str, pt)
-        #         sole = Helper.genearte_MD5(sole_str, pt)
-        #         size_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                          "odds_only", "sole", "source", "type", "team"]
-        #         condition = size_home_rule[index]
-        #         size_home_value = [match_id, league_id, "gsb", "0", index, p_code, value, condition, odds_only,
-        #                            sole, "hg3535", "0", ""]
-        #         size_home_data = dict(zip(size_home_key, size_home_value))
-        #         data_list.append(size_home_data)
-        #     # size_guest
-        #     for index, value in enumerate(size_guest):
-        #         hash_str = p_code + "gss" + str(index) + str(size_guest_rule[index]) + str(value) + "hg3535" + str(
-        #             match_id)
-        #         sole_str = p_code + "gss" + str(index) + str(match_id) + "hg3535"
-        #         odds_only = Helper.genearte_MD5(hash_str, pt)
-        #         sole = Helper.genearte_MD5(sole_str, pt)
-        #         size_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                           "odds_only", "sole", "source", "type", "team"]
-        #         condition = size_guest_rule[index]
-        #         size_guest_value = [match_id, league_id, "gss", "0", index, p_code, value, condition, odds_only,
-        #                             sole, "hg3535", "0", ""]
-        #         size_home_data = dict(zip(size_guest_key, size_guest_value))
-        #         data_list.append(size_home_data)
-        #
-        #     p_code = 'CO'
-        #     half_concede_home_rule = item["half_concede_home_rule"]
-        #     half_concede_home = item["half_concede_home"]
-        #     half_concede_guest_rule = item["half_concede_guest_rule"]
-        #     half_concede_guest = item["half_concede_guest"]
-        #     # half_concede_home
-        #     if half_concede_guest:
-        #         for index, value in enumerate(half_concede_guest):
-        #             hash_str = p_code + "cog_h" + str(index) + str(half_concede_guest_rule[index]) + str(
-        #                 value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + "cog_h" + str(index) + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             half_concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                       "condition",
-        #                                       "odds_only", "sole", "source", "type", "team"]
-        #             condition = half_concede_guest_rule[index]
-        #             half_concede_guest_value = [match_id, league_id, "cog_h", "0", index, p_code, value, condition,
-        #                                         odds_only, sole, "hg3535", "0", ""]
-        #             half_concede_guest_data = dict(zip(half_concede_guest_key, half_concede_guest_value))
-        #             data_list.append(half_concede_guest_data)
-        #
-        #     # half_concede_home
-        #     if half_concede_home:
-        #         for index, value in enumerate(half_concede_home):
-        #             hash_str = p_code + "coh_h" + str(index) + str(half_concede_home_rule[index]) + str(
-        #                 value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + "coh_h" + str(index) + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             half_concede_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                      "condition",
-        #                                      "odds_only", "sole", "source", "type", "team"]
-        #             condition = half_concede_home_rule[index]
-        #             half_concede_home_value = [match_id, league_id, "coh_h", "0", index, p_code, value, condition,
-        #                                        odds_only, sole, "hg3535", "0", ""]
-        #             half_concede_home_data = dict(zip(half_concede_home_key, half_concede_home_value))
-        #             data_list.append(half_concede_home_data)
-        #
-        #     concede_guest = item["concede_guest"]
-        #     concede_guest_rule = item["concede_guest_rule"]
-        #     concede_home = item["concede_home"]
-        #     concede_home_rule = item["concede_home_rule"]
-        #     # concede_guest
-        #     if concede_guest:
-        #         for index, value in enumerate(concede_guest):
-        #             hash_str = p_code + "cog" + str(index) + str(concede_guest_rule[index]) + str(
-        #                 value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + "cog" + str(index) + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             concede_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                  "condition",
-        #                                  "odds_only", "sole", "source", "type", "team"]
-        #             condition = concede_guest_rule[index]
-        #             concede_guest_value = [match_id, league_id, "cog", "0", index, p_code, value, condition,
-        #                                    odds_only, sole, "hg3535", "0", ""]
-        #             concede_guest_data = dict(zip(concede_guest_key, concede_guest_value))
-        #             data_list.append(concede_guest_data)
-        #     # concede_home
-        #     if concede_home:
-        #         for index, value in enumerate(concede_home):
-        #             hash_str = p_code + "coh" + str(index) + str(concede_home_rule[index]) + str(
-        #                 value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + "coh" + str(index) + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             concede_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                 "condition",
-        #                                 "odds_only", "sole", "source", "type", "team"]
-        #             condition = concede_home_rule[index]
-        #             concede_home_value = [match_id, league_id, "coh", "0", index, p_code, value, condition, odds_only,
-        #                                   sole, "hg3535", "0", ""]
-        #             concede_guest_data = dict(zip(concede_home_key, concede_home_value))
-        #             data_list.append(concede_guest_data)
-        #
-        #     # 独赢----------------------------------------------------------------------------------------------------------
-        #     p_code = 'C'
-        #     half_capot_home = item["half_capot_home"]
-        #     half_capot_guest = item["half_capot_guest"]
-        #     half_capot_dogfall = item["half_capot_dogfall"]
-        #     capot_home = item["capot_home"]
-        #     capot_guest = item["capot_guest"]
-        #     capot_dogfall = item["capot_dogfall"]
-        #
-        #     # half_capot_home
-        #     hash_str = p_code + "ch_h" + '0' + '1' + str(half_capot_home) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "ch_h" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     half_capot_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                            "odds_only", "sole", "source", "type", "team"]
-        #     half_capot_home_value = [match_id, league_id, "ch_h", "0", 0, p_code, half_capot_home, '1',
-        #                              odds_only, sole, "hg3535", "0", ""]
-        #     half_capot_homet_data = dict(zip(half_capot_home_key, half_capot_home_value))
-        #     data_list.append(half_capot_homet_data)
-        #
-        #     # half_capot_guest
-        #     hash_str = p_code + "cg_h" + '0' + '2' + str(half_capot_guest) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "cg_h" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     half_capot_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                             "odds_only", "sole", "source", "type", "team"]
-        #     half_capot_guest_value = [match_id, league_id, "cg_h", "0", 0, p_code, half_capot_guest, '2',
-        #                               odds_only, sole, "hg3535", "0", ""]
-        #     half_capot_guest_data = dict(zip(half_capot_guest_key, half_capot_guest_value))
-        #     data_list.append(half_capot_guest_data)
-        #
-        #     # half_capot_dogfall
-        #     hash_str = p_code + "cd_h" + '0' + 'X' + str(half_capot_dogfall) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "cd_h" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     half_capot_dogfall_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                               "odds_only", "sole", "source", "type", "team"]
-        #     half_capot_dogfall_value = [match_id, league_id, "cd_h", "0", 0, p_code, half_capot_dogfall, 'X',
-        #                                 odds_only, sole, "hg3535", "0", ""]
-        #     half_capot_dogfall_data = dict(zip(half_capot_dogfall_key, half_capot_dogfall_value))
-        #     data_list.append(half_capot_dogfall_data)
-        #
-        #     # capot_dogfall
-        #     hash_str = p_code + "cd" + '0' + 'X' + str(capot_dogfall) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "cd" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     capot_dogfall_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                          "odds_only", "sole", "source", "type", "team"]
-        #     capot_dogfall_value = [match_id, league_id, "cd", "0", 0, p_code, capot_dogfall, 'X', odds_only,
-        #                            sole, "hg3535", "0", ""]
-        #     capot_dogfall_data = dict(zip(capot_dogfall_key, capot_dogfall_value))
-        #     data_list.append(capot_dogfall_data)
-        #
-        #     # capot_home
-        #     hash_str = p_code + "ch" + '0' + '1' + str(capot_home) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "ch" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     capot_home_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                       "odds_only", "sole", "source", "type", "team"]
-        #     capot_home_value = [match_id, league_id, "ch", "0", 0, p_code, capot_home, '1',
-        #                         odds_only, sole, "hg3535", "0", ""]
-        #     capot_homet_data = dict(zip(capot_home_key, capot_home_value))
-        #     data_list.append(capot_homet_data)
-        #
-        #     # capot_guest
-        #     hash_str = p_code + "cg" + '0' + '2' + str(capot_guest) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "cg" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     capot_guest_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                        "odds_only", "sole", "source", "type", "team"]
-        #     capot_guest_value = [match_id, league_id, "cg", "0", 0, p_code, capot_guest, '2',
-        #                          odds_only, sole, "hg3535", "0", ""]
-        #     capot_guest_data = dict(zip(capot_guest_key, capot_guest_value))
-        #     data_list.append(capot_guest_data)
-        #
-        #     # 入球数单双-----------------------------------------------------------------------------------------------------
-        #     # p_code, p_id = get_pcode(corner_ball, 'two_sides')
-        #     p_code = 'TS'
-        #     odd_even_odd = item["odd_even_odd"]
-        #     odd_even_even = item["odd_even_even"]
-        #     half_odd_even_odd = item["half_odd_even_odd"]
-        #     half_odd_even_even = item["half_odd_even_even"]
-        #
-        #     # odd_even_odd
-        #     hash_str = p_code + "tss" + '0' + '单' + str(odd_even_odd) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "tss" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     single_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                   "odds_only", "sole", "source", "type", "team"]
-        #     single_value = [match_id, league_id, "tss", "0", 0, p_code, odd_even_odd, '单',
-        #                     odds_only, sole, "hg3535", "0", ""]
-        #     single_data = dict(zip(single_key, single_value))
-        #     data_list.append(single_data)
-        #
-        #     # odd_even_even
-        #     hash_str = p_code + "tsd" + '0' + '双' + str(odd_even_even) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "tsd" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     double_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                   "odds_only", "sole", "source", "type", "team"]
-        #     double_value = [match_id, league_id, "tsd", "0", 0, p_code, odd_even_even, '双',
-        #                     odds_only, sole, "hg3535", "0", ""]
-        #     double_data = dict(zip(double_key, double_value))
-        #     data_list.append(double_data)
-        #
-        #     # half_odd_even_even
-        #     hash_str = p_code + "tsd_h" + '0' + '双' + str(half_odd_even_even) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "tsd_h" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     half_double_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                        "odds_only", "sole", "source", "type", "team"]
-        #     half_double_value = [match_id, league_id, "tsd_h", "0", 0, p_code, half_odd_even_even, '双',
-        #                          odds_only, sole, "hg3535", "0", ""]
-        #     half_double_data = dict(zip(half_double_key, half_double_value))
-        #     data_list.append(half_double_data)
-        #
-        #     # half_odd_even_odd
-        #     hash_str = p_code + "tss_h" + '0' + '单' + str(half_odd_even_odd) + "hg3535" + str(match_id)
-        #     sole_str = p_code + "tss_h" + '0' + str(match_id) + "hg3535"
-        #     odds_only = Helper.genearte_MD5(hash_str, pt)
-        #     sole = Helper.genearte_MD5(sole_str, pt)
-        #     half_single_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                        "odds_only", "sole", "source", "type", "team"]
-        #     half_single_value = [match_id, league_id, "tss_h", "0", 0, p_code, half_odd_even_odd, '单', odds_only,
-        #                          sole, "hg3535", "0", ""]
-        #     half_single_data = dict(zip(half_single_key, half_single_value))
-        #     data_list.append(half_single_data)
-        #
-        #     # 总入球数 ---------------------------------------------------------------------------------------------------
-        #     p_code = 'TG'
-        #     total_goals = item['total_goal']
-        #     total_dict = {'tg0': '0-1', 'tg1': '2-3', 'tg2': '4-6', 'tg3': '7或以上', 'tg0_h': '0', "tg1_h": '1',
-        #                   "tg2_h": '2', "tg3_h": '3或以上'}
-        #     # 全场入球数 单双
-        #     # 上半场入球数 单双
-        #     for key, value in total_goals.items():
-        #         hash_str = p_code + key + '0' + total_dict[key] + str(value) + "hg3535" + str(match_id)
-        #         sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-        #         odds_only = Helper.genearte_MD5(hash_str, pt)
-        #         sole = Helper.genearte_MD5(sole_str, pt)
-        #         total_goals_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                            "odds_only", "sole", "source", "type", "team"]
-        #         total_goals_value = [match_id, league_id, key, "0", 0, p_code, value, total_dict[key], odds_only,
-        #                              sole, "hg3535", "0", ""]
-        #         total_goals_data = dict(zip(total_goals_key, total_goals_value))
-        #         data_list.append(total_goals_data)
-        #
-        #     # 全场半场 ---------------------------------------------------------------------------------------------------
-        #     half_fulls = item['half_full']
-        #     p_code = 'HF'
-        #     full_dict = {"hfhh": "主主", "hfhd": "主和", "hfhg": "主客", "hfdh": "和主",
-        #                  "hfdd": "和和", "hfdg": "和客", "hfgh": "客主", "hfgd": "客和", "hfgg": "客客"}
-        #     if half_fulls:
-        #         for key, value in half_fulls.items():
-        #             hash_str = p_code + key + '0' + full_dict[key] + str(value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             half_fulls_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                               "odds_only", "sole", "source", "type", "team"]
-        #             half_fulls_value = [match_id, league_id, key, "0", 0, p_code, value, full_dict[key], odds_only,
-        #                                 sole, "hg3535", "0", ""]
-        #             half_fulls_data = dict(zip(half_fulls_key, half_fulls_value))
-        #             data_list.append(half_fulls_data)
-        #
-        #     # 波胆-----------------------------------------------------------------------------------------------------------
-        #     bodan_datas = item['bodan_data']
-        #     p_code = 'B'
-        #     bodan_dict = {"b10": "1-0", "b20": "2-0", "b21": "2-1", "b30": "3-0", "b31": "3-1", "b32": "3-2",
-        #                   "b40": "4-0", "b41": "4-1", "b42": "4-2", "b43": "4-3", "b01": "0-1", "b02": "0-2",
-        #                   "b12": "1-2", "b03": "0-3", "b13": "1-3", "b23": "2-3", "b04": "0-4", "b14": "1-4",
-        #                   "b24": "2-4", "b34": "3-4", "b00": "0-0", "b11": "1-1", "b22": "2-2", "b33": "3-3",
-        #                   "b44": "4-4", "bo": "其他", "b10_h": "1-0", "b20_h": "2-0", "b21_h": "2-1", "b30_h": "3-0",
-        #                   "b31_h": "3-1", "b32_h": "3-2", "b01_h": "0-1", "b02_h": "0-2", "b12_h": "1-2",
-        #                   "b03_h": "0-3",
-        #                   "b13_h": "1-3", "b23_h": "2-3", "b00_h": "0-0", "b11_h": "1-1", "b22_h": "2-2",
-        #                   "b33_h": "3-3",
-        #                   "bo_h": "其他"}
-        #     if bodan_datas:
-        #         for key, value in bodan_datas.items():
-        #             hash_str = p_code + key + '0' + bodan_dict[key] + str(value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             bodan_dict_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds", "condition",
-        #                               "odds_only", "sole", "source", "type", "team"]
-        #             bodan_dict_value = [match_id, league_id, key, "0", 0, p_code, value, bodan_dict[key], odds_only,
-        #                                 sole, "hg3535", "0", ""]
-        #             bodan_dict_data = dict(zip(bodan_dict_key, bodan_dict_value))
-        #             data_list.append(bodan_dict_data)
-        #
-        #     # 最先进球/最后进球 ----------------------------------------------------------------------------------------------
-        #     first_last_balls = item['first_last_ball']
-        #     # p_code, p_id = get_pcode(corner_ball, 'first_last_ball')
-        #     p_code = 'FLB'
-        #     first_last_dict = {"flbfh": "最先进球", "flbfg": "最先进球", "flblh": "最后进球", "flblg": "最后进球", "flbn": "没有进球"}
-        #     if first_last_balls:
-        #         for key, value in first_last_balls.items():
-        #             hash_str = p_code + key + '0' + first_last_dict[key] + str(value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             first_last_balls_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                     "condition",
-        #                                     "odds_only", "sole", "source", "type", "team"]
-        #             first_last_balls_value = [match_id, league_id, key, "0", 0, p_code, value, first_last_dict[key],
-        #                                       odds_only,
-        #                                       sole, "hg3535", "0", ""]
-        #             first_last_balls_data = dict(zip(first_last_balls_key, first_last_balls_value))
-        #             data_list.append(first_last_balls_data)
-        #
-        #     # 球队得分大小
-        #     p_code = 'TB'
-        #     # 全场
-        #     full_dicts = item['full_data']
-        #     # 上半场
-        #     half_dicts = item['half_data']
-        #     full_dict_rules = item['full_data_rule']
-        #     half_dict_rules = item['half_data_rule']
-        #     if full_dicts:
-        #         for key, value in full_dicts.items():
-        #             hash_str = p_code + key + '0' + full_dict_rules[key] + str(value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             full_dict_rules_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                                    "condition", "odds_only", "sole", "source", "type", "team"]
-        #             full_dict_rules_value = [match_id, league_id, key, "0", 0, p_code, value, full_dict_rules[key],
-        #                                      odds_only, sole, "hg3535", "0", ""]
-        #             full_dict_rules_data = dict(zip(full_dict_rules_key, full_dict_rules_value))
-        #             data_list.append(full_dict_rules_data)
-        #
-        #     if half_dicts:
-        #         for key, value in half_dicts.items():
-        #             hash_str = p_code + key + '0' + half_dict_rules[key] + str(value) + "hg3535" + str(match_id)
-        #             sole_str = p_code + key + '0' + str(match_id) + "hg3535"
-        #             odds_only = Helper.genearte_MD5(hash_str, pt)
-        #             sole = Helper.genearte_MD5(sole_str, pt)
-        #             half_dicts_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-        #                               "condition", "odds_only", "sole", "source", "type", "team"]
-        #             half_dicts_value = [match_id, league_id, key, "0", 0, p_code, value, half_dict_rules[key],
-        #                                 odds_only, sole, "hg3535", "0", ""]
-        #             half_dicts_data = dict(zip(half_dicts_key, half_dicts_value))
-        #             data_list.append(half_dicts_data)
-        #
+            data_list = []
+            odds_onlys = []
             p_code = 'CB'
             horn_ou_dict = item['horn_ou_dict']
             horn_ou_dict_rule = item['horn_ou_dict_rule']