Browse Source

更新篮球, 父级玩法错误

Your Name 6 years ago
parent
commit
279645eb06
2 changed files with 166 additions and 145 deletions
  1. 158 108
      hg3535/.idea/workspace.xml
  2. 8 37
      hg3535/pipeline/lanqiu.py

+ 158 - 108
hg3535/.idea/workspace.xml

@@ -3,11 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="7fa42e97-ddea-4404-91db-5a9ccc162649" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pipeline/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/pipeline/lanqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/bangqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/bangqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/lanqiu.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/spiders/roll_lanqiu.py" beforeDir="false" afterPath="$PROJECT_DIR$/spiders/roll_lanqiu.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -17,7 +13,7 @@
   </component>
   <component name="CoverageDataManager">
     <SUITE FILE_PATH="coverage/hg3535$items.coverage" NAME="items Coverage Results" MODIFIED="1554291398794" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
-    <SUITE FILE_PATH="coverage/hg3535$main.coverage" NAME="main Coverage Results" MODIFIED="1568021098926" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
+    <SUITE FILE_PATH="coverage/hg3535$main.coverage" NAME="main Coverage Results" MODIFIED="1568022561550" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$change.coverage" NAME="change Coverage Results" MODIFIED="1567749757856" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/hg3535$hgjieshu.coverage" NAME="hgjieshu Coverage Results" MODIFIED="1558494720094" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
     <SUITE FILE_PATH="coverage/hg3535$halffull.coverage" NAME="halffull Coverage Results" MODIFIED="1554544334424" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/spiders" />
@@ -61,7 +57,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-2654">
+            <state relative-caret-position="-2234">
               <caret line="63" selection-start-line="63" selection-end-line="65" selection-end-column="40" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
@@ -70,11 +66,35 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="129">
+              <caret line="191" column="48" lean-forward="true" selection-start-line="191" selection-start-column="48" selection-end-line="191" selection-end-column="48" />
+              <folding>
+                <element signature="e#0#15#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/utils/helper.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="480">
+              <caret line="27" selection-start-line="27" selection-end-line="27" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
+            <state relative-caret-position="226">
+              <caret line="285" column="59" lean-forward="true" selection-start-line="285" selection-start-column="59" selection-end-line="285" selection-end-column="59" />
               <folding>
                 <element signature="e#24#35#0" expanded="true" />
               </folding>
@@ -85,7 +105,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
+            <state relative-caret-position="227">
               <caret line="37" selection-start-line="37" selection-end-line="37" />
               <folding>
                 <element signature="e#0#15#0" expanded="true" />
@@ -94,13 +114,13 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-7023">
-              <caret line="281" column="60" selection-start-line="281" selection-start-column="60" selection-end-line="281" selection-end-column="60" />
+            <state relative-caret-position="127">
+              <caret line="216" column="28" selection-start-line="216" selection-start-column="27" selection-end-line="216" selection-end-column="30" />
               <folding>
-                <element signature="e#24#39#0" expanded="true" />
+                <element signature="e#0#15#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -117,9 +137,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>lastnumber_dict</find>
-      <find>last_numbers_dict</find>
-      <find>capots_dict</find>
       <find>self.session</find>
       <find>settings.</find>
       <find>sq_dict</find>
@@ -142,11 +159,14 @@
       <find>corner_ball</find>
       <find>Hgjieshu</find>
       <find>total_size</find>
-      <find>team_scores_dict</find>
       <find>p_code</find>
       <find>3438017</find>
       <find>utime</find>
+      <find>team_scores_dict</find>
+      <find>total_sizes_dict</find>
+      <find>last_home_dict</find>
       <find>rangqiu_daxiao</find>
+      <find>0或5</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;&quot;</replace>
@@ -238,20 +258,20 @@
         <option value="$PROJECT_DIR$/spiders/zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_zuqiu.py" />
         <option value="$PROJECT_DIR$/spiders/jieshu.py" />
-        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
         <option value="$PROJECT_DIR$/pipeline/zuqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/wangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/bangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/guanjun.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_wangqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_zuqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
         <option value="$PROJECT_DIR$/pipeline/roll_bangqiu.py" />
         <option value="$PROJECT_DIR$/spiders/bangqiu.py" />
-        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
         <option value="$PROJECT_DIR$/main.py" />
-        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
         <option value="$PROJECT_DIR$/spiders/roll_lanqiu.py" />
+        <option value="$PROJECT_DIR$/spiders/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/jieshu.py" />
+        <option value="$PROJECT_DIR$/pipeline/lanqiu.py" />
+        <option value="$PROJECT_DIR$/pipeline/roll_lanqiu.py" />
       </list>
     </option>
   </component>
@@ -597,21 +617,7 @@
       <workItem from="1567765446416" duration="3616000" />
       <workItem from="1567826229018" duration="3226000" />
       <workItem from="1567836768286" duration="10382000" />
-      <workItem from="1567990502559" duration="19640000" />
-    </task>
-    <task id="LOCAL-00012" summary="修改足球,篮球赔率表插入">
-      <created>1556186556377</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1556186556377</updated>
-    </task>
-    <task id="LOCAL-00013" summary="修改赔率条件,部分赔率减1">
-      <created>1556430855618</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1556430855618</updated>
+      <workItem from="1567990502559" duration="24631000" />
     </task>
     <task id="LOCAL-00014" summary="添加冠军赛事信息,到赛事表中">
       <created>1557042186914</created>
@@ -942,11 +948,25 @@
       <option name="project" value="LOCAL" />
       <updated>1568012509861</updated>
     </task>
-    <option name="localTasksCounter" value="61" />
+    <task id="LOCAL-00061" summary="更新篮球, 父级玩法错误">
+      <created>1568021587755</created>
+      <option name="number" value="00061" />
+      <option name="presentableId" value="LOCAL-00061" />
+      <option name="project" value="LOCAL" />
+      <updated>1568021587755</updated>
+    </task>
+    <task id="LOCAL-00062" summary="更新篮球, 父级玩法错误">
+      <created>1568026066857</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1568026066858</updated>
+    </task>
+    <option name="localTasksCounter" value="63" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="1903044000" />
+    <option name="totallyTimeSpent" value="1908035000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -961,12 +981,12 @@
     <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15245202" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.71173847" visible="true" weight="0.15245202" />
       <window_info id="Structure" order="1" sideWeight="0.2882615" side_tool="true" weight="0.1108742" />
       <window_info id="Favorites" order="2" sideWeight="0.5013405" side_tool="true" weight="0.108208954" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32832617" />
-      <window_info active="true" anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" visible="true" weight="0.17596567" />
+      <window_info anchor="bottom" id="Debug" order="2" sideWeight="0.49946696" visible="true" weight="0.27360514" />
       <window_info anchor="bottom" id="Cvs" order="3" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="4" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="5" weight="0.32832617" />
@@ -976,7 +996,7 @@
       <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50692964" side_tool="true" weight="0.38519314" />
       <window_info anchor="bottom" x="22" y="376" width="1876" height="298" id="Terminal" order="10" sideWeight="0.49307036" weight="0.15987125" />
       <window_info anchor="bottom" id="Python Console" order="11" sideWeight="0.49946696" weight="0.37017167" />
-      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.5665236" />
+      <window_info anchor="bottom" id="Run" order="12" sideWeight="0.87473345" weight="0.23175965" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -1141,11 +1161,6 @@
           <line>63</line>
           <option name="timeStamp" value="132" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>233</line>
-          <option name="timeStamp" value="136" />
-        </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/pipeline/roll_bangqiu.py</url>
           <line>209</line>
@@ -1247,39 +1262,74 @@
           <option name="timeStamp" value="226" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
-          <line>81</line>
-          <option name="timeStamp" value="231" />
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>662</line>
+          <option name="timeStamp" value="239" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>647</line>
+          <option name="timeStamp" value="240" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
-          <line>246</line>
-          <option name="timeStamp" value="232" />
+          <line>618</line>
+          <option name="timeStamp" value="241" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
-          <line>260</line>
-          <option name="timeStamp" value="233" />
+          <line>595</line>
+          <option name="timeStamp" value="242" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
-          <line>274</line>
-          <option name="timeStamp" value="234" />
+          <line>580</line>
+          <option name="timeStamp" value="243" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>565</line>
+          <option name="timeStamp" value="244" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
-          <line>288</line>
-          <option name="timeStamp" value="235" />
+          <line>550</line>
+          <option name="timeStamp" value="245" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
-          <line>302</line>
-          <option name="timeStamp" value="236" />
+          <line>534</line>
+          <option name="timeStamp" value="246" />
         </line-breakpoint>
         <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
           <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
-          <line>316</line>
-          <option name="timeStamp" value="238" />
+          <line>520</line>
+          <option name="timeStamp" value="247" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>739</line>
+          <option name="timeStamp" value="248" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/spiders/lanqiu.py</url>
+          <line>740</line>
+          <option name="timeStamp" value="249" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
+          <line>234</line>
+          <option name="timeStamp" value="252" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
+          <line>188</line>
+          <option name="timeStamp" value="256" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/pipeline/lanqiu.py</url>
+          <line>187</line>
+          <option name="timeStamp" value="257" />
         </line-breakpoint>
       </breakpoints>
       <default-breakpoints>
@@ -1482,16 +1532,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/utils/helper.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="420">
-          <caret line="21" column="20" selection-end-line="34" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="20">
@@ -1593,16 +1633,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="280">
-          <caret line="44" column="64" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="68" />
-          <folding>
-            <element signature="e#18#33#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_zuqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="199">
@@ -1613,16 +1643,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="440">
-          <caret line="59" selection-start-line="59" selection-end-line="61" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#15#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_bangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2689">
@@ -1664,19 +1684,29 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="433">
-          <caret line="309" lean-forward="true" selection-start-line="309" selection-end-line="309" />
+        <state relative-caret-position="180">
+          <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
           <folding>
-            <element signature="e#0#15#0" expanded="true" />
+            <element signature="e#0#10#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/utils/helper.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/pipeline/roll_wangqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2654">
+        <state relative-caret-position="-2234">
           <caret line="63" selection-start-line="63" selection-end-line="65" selection-end-column="40" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
@@ -1684,9 +1714,19 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1623">
+          <caret line="281" column="60" selection-start-line="281" selection-start-column="60" selection-end-line="281" selection-end-column="60" />
+          <folding>
+            <element signature="e#24#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/spiders/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
+        <state relative-caret-position="227">
           <caret line="37" selection-start-line="37" selection-end-line="37" />
           <folding>
             <element signature="e#0#15#0" expanded="true" />
@@ -1694,32 +1734,42 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/main.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/jieshu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="9" column="38" lean-forward="true" selection-start-line="9" selection-start-column="38" selection-end-line="9" selection-end-column="38" />
+        <state relative-caret-position="153">
+          <caret line="46" column="18" lean-forward="true" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="18" />
           <folding>
-            <element signature="e#0#10#0" expanded="true" />
+            <element signature="e#18#33#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/spiders/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="75" column="53" lean-forward="true" selection-start-line="75" selection-start-column="53" selection-end-line="75" selection-end-column="53" />
+        <state relative-caret-position="226">
+          <caret line="285" column="59" lean-forward="true" selection-start-line="285" selection-start-column="59" selection-end-line="285" selection-end-column="59" />
           <folding>
             <element signature="e#24#35#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/spiders/roll_lanqiu.py">
+    <entry file="file://$PROJECT_DIR$/pipeline/lanqiu.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-7023">
-          <caret line="281" column="60" selection-start-line="281" selection-start-column="60" selection-end-line="281" selection-end-column="60" />
+        <state relative-caret-position="127">
+          <caret line="216" column="28" selection-start-line="216" selection-start-column="27" selection-end-line="216" selection-end-column="30" />
           <folding>
-            <element signature="e#24#39#0" expanded="true" />
+            <element signature="e#0#15#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pipeline/roll_lanqiu.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="129">
+          <caret line="191" column="48" lean-forward="true" selection-start-line="191" selection-start-column="48" selection-end-line="191" selection-end-column="48" />
+          <folding>
+            <element signature="e#0#15#0" expanded="true" />
           </folding>
         </state>
       </provider>

+ 8 - 37
hg3535/pipeline/lanqiu.py

@@ -155,40 +155,25 @@ class Lanqiupipeline(object):
             for key, value in concedes_dict.items():
                 if value:
                     for index, concedes_value in enumerate(value):
-                        sole_str = 'CO' + str(index) + str(match_id) + 'hg3535'
+                        sole_str = 'CO' + str(key) + str(index) + str(match_id) + 'hg3535'
                         sole = Helper.genearte_MD5(sole_str, pt)
-                        odds_str = 'CO' + str(index) + str(match_id) + 'hg3535' + str(
-                            concedes_dict_rule[key][index]) + str(concedes_value)
-                        odds_only = Helper.genearte_MD5(odds_str, pt)
                         condition = str(concedes_dict_rule[key][index])
+                        hash_str = "CO" + key + str(index) + condition + str(value) + "hg3535" + str(match_id)
+                        odds_only = Helper.genearte_MD5(hash_str, pt)
                         concedes_dict_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                              "condition", "odds_only", "sole", "source", "type", "team"]
                         concedes_dict_value = [match_id, league_id, key, '0', index, 'CO', concedes_value, condition,
                                                odds_only, sole, 'hg3535', '0', '']
                         concedes_dict_data = dict(zip(concedes_dict_key, concedes_dict_value))
                         data_list.append(concedes_dict_data)
-                else:
-                    sole_str = 'CO' + str(key) + str(match_id) + 'hg3535'
-                    sole = Helper.genearte_MD5(sole_str, pt)
-                    odds_str = 'CO' + str(key) + str(match_id) + 'hg3535' + str(
-                        concedes_dict_rule[key]) + str(value)
-                    odds_only = Helper.genearte_MD5(odds_str, pt)
-                    condition = str(concedes_dict_rule[key])
-                    concedes_dict_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-                                         "condition", "odds_only", "sole", "source", "type", "team"]
-                    concedes_dict_value = [match_id, league_id, key, '0', 0, 'CO', value, condition,
-                                           odds_only, sole, 'hg3535', '0', '']
-                    concedes_dict_data = dict(zip(concedes_dict_key, concedes_dict_value))
-                    data_list.append(concedes_dict_data)
         # 总得分单双
         if odd_evens_dict:
             for key, value in odd_evens_dict.items():
-                sole_str = 'TS' + str(key) + str(match_id) + 'hg3535'
+                sole_str = 'TS' + str(key) + '0' + str(match_id) + 'hg3535'
                 sole = Helper.genearte_MD5(sole_str, pt)
-                odds_str = 'TS' + str(key) + str(match_id) + 'hg3535' + str(
-                    odd_evens_dict_rule[key]) + str(value)
-                odds_only = Helper.genearte_MD5(odds_str, pt)
                 condition = str(odd_evens_dict_rule[key])
+                hash_str = "TS" + key + '0' + condition + str(value) + "hg3535" + str(match_id)
+                odds_only = Helper.genearte_MD5(hash_str, pt)
                 odd_evens_dict_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                       "condition", "odds_only", "sole", "source", "type", "team"]
                 odd_evens_dict_value = [match_id, league_id, key, '0', 0, 'TS', value, condition,
@@ -200,12 +185,10 @@ class Lanqiupipeline(object):
             for key, value in total_sizes_dict.items():
                 if value:
                     for index, total_sizes_value in enumerate(value):
-                        sole_str = 'TN' + str(key) + str(match_id) + 'hg3535'
+                        sole_str = 'TN' + str(key) + str(index) + str(match_id) + 'hg3535'
                         sole = Helper.genearte_MD5(sole_str, pt)
-                        # odds_str = 'TN' + str(key) + str(match_id) + 'hg3535' + str(
-                        #     total_sizes_dict_rule[key][index]) + str(total_sizes_value)
                         condition = str(total_sizes_dict_rule[key][index])
-                        hash_str = "TN" + condition + '0' + '0' + str(total_sizes_value) + "hg3535" + str(match_id)
+                        hash_str = "TN" + str(key) + str(index) + condition + str(total_sizes_value) + "hg3535" + str(match_id)
                         odds_only = Helper.genearte_MD5(hash_str, pt)
                         total_sizes_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
                                            "condition", "odds_only", "sole", "source", "type", "team"]
@@ -213,18 +196,6 @@ class Lanqiupipeline(object):
                                              odds_only, sole, 'hg3535', '0', '']
                         total_sizes_data = dict(zip(total_sizes_key, total_sizes_value))
                         data_list.append(total_sizes_data)
-                # else:
-                #     sole_str = "TN" + str(key) + '0' + str(match_id) + "hg3535"
-                #     sole = Helper.genearte_MD5(sole_str, pt)
-                #     condition = str(total_sizes_dict_rule[key])
-                #     hash_str = "TN" + key + '0' + '0' + str(value) + "hg3535" + str(match_id)
-                #     odds_only = Helper.genearte_MD5(hash_str, pt)
-                #     total_sizes_key = ["match_id", "lg_id", "odds_code", "status", "sort", "p_code", "odds",
-                #                        "condition", "odds_only", "sole", "source", "type", "team"]
-                #     total_sizes_value = [match_id, league_id, key, '0', 0, 'TN', value, condition,
-                #                          odds_only, sole, 'hg3535', '0', '']
-                #     total_sizes_data = dict(zip(total_sizes_key, total_sizes_value))
-                #     data_list.append(total_sizes_data)
         # 球队得分大小
         if team_scores_dict:
             for key, value in team_scores_dict.items():