Skip to content

D
dymas
Commit e607b958 authored by lixiaofang's avatar lixiaofang
Browse files
Options

添加query_type流程

parent 8a9f09c0
Show whitespace changes
Inline Side-by-side
Showing with 99 additions and 36 deletions
.idea/workspace.xml
View file @ e607b958
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" name="Default Changelist" comment="" /> <list default="true" id="ae0ff912-332d-4611-9939-a4d235689946" 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$/search/views/sku.py" beforeDir="false" afterPath="$PROJECT_DIR$/search/views/sku.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -20,35 +23,39 @@ ...@@ -20,35 +23,39 @@
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
<counts> <counts>
<entry key="py" value="24" /> <entry key="py" value="26" />
<entry key="txt" value="2" /> <entry key="txt" value="2" />
<entry key="xml" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="PLAIN_TEXT" value="2" /> <entry key="PLAIN_TEXT" value="2" />
<entry key="Python" value="24" /> <entry key="Python" value="26" />
<entry key="XML" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="py" value="6" /> <entry key="py" value="11" />
<entry key="xml" value="25" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="Python" value="6" /> <entry key="Python" value="11" />
<entry key="XML" value="25" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/search/views/sku.py"> <entry file="file://$PROJECT_DIR$/search/views/sku.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476"> <state relative-caret-position="-2792">
<caret line="90" selection-start-line="90" selection-end-line="90" /> <caret line="73" column="29" selection-start-line="73" selection-start-column="7" selection-end-line="73" selection-end-column="29" />
<folding> <folding>
<element signature="e#24#52#0" expanded="true" /> <element signature="e#24#52#0" expanded="true" />
<element signature="e#1704#2757#0" /> <element signature="e#1704#2757#0" />
...@@ -70,17 +77,17 @@ ...@@ -70,17 +77,17 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/log_settings.py"> <entry file="file://$PROJECT_DIR$/doris/log_settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="195">
<caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" /> <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/requirements.txt"> <entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="258">
<caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" /> <caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -88,8 +95,35 @@ ...@@ -88,8 +95,35 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/devel.py"> <entry file="file://$PROJECT_DIR$/doris/devel.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="130">
<caret line="43" column="56" selection-start-line="43" selection-start-column="56" selection-end-line="43" selection-end-column="56" /> <caret line="37" column="24" lean-forward="true" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/doris/deploy_devel.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/rank/utils/rpc_data.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-29">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="90" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/rank/forms/interpose.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="229" column="22" selection-start-line="229" selection-start-column="22" selection-end-line="229" selection-end-column="22" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -122,6 +156,7 @@ ...@@ -122,6 +156,7 @@
<find>&gt;&gt;&gt;</find> <find>&gt;&gt;&gt;</find>
<find>/data/lo</find> <find>/data/lo</find>
<find>urllib3</find> <find>urllib3</find>
<find>rpc</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -142,7 +177,6 @@ ...@@ -142,7 +177,6 @@
<option value="$PROJECT_DIR$/doris/devel.py" /> <option value="$PROJECT_DIR$/doris/devel.py" />
<option value="$PROJECT_DIR$/recommend/views/detail.py" /> <option value="$PROJECT_DIR$/recommend/views/detail.py" />
<option value="$PROJECT_DIR$/recommend/views/service.py" /> <option value="$PROJECT_DIR$/recommend/views/service.py" />
<option value="$PROJECT_DIR$/search/views/sku.py" />
<option value="$PROJECT_DIR$/search/views/service.py" /> <option value="$PROJECT_DIR$/search/views/service.py" />
<option value="$PROJECT_DIR$/search/views/search_comprehensive.py" /> <option value="$PROJECT_DIR$/search/views/search_comprehensive.py" />
<option value="$PROJECT_DIR$/search/views/tractate.py" /> <option value="$PROJECT_DIR$/search/views/tractate.py" />
...@@ -150,11 +184,13 @@ ...@@ -150,11 +184,13 @@
<option value="$PROJECT_DIR$/search/management/commands/debugscript.py" /> <option value="$PROJECT_DIR$/search/management/commands/debugscript.py" />
<option value="$PROJECT_DIR$/doris/log_settings.py" /> <option value="$PROJECT_DIR$/doris/log_settings.py" />
<option value="$PROJECT_DIR$/requirements.txt" /> <option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/doris/deploy_devel.xml" />
<option value="$PROJECT_DIR$/search/views/sku.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="239" /> <option name="x" value="-323" />
<option name="y" value="-1080" /> <option name="y" value="-1080" />
<option name="width" value="1920" /> <option name="width" value="1920" />
<option name="height" value="1080" /> <option name="height" value="1080" />
...@@ -192,7 +228,13 @@ ...@@ -192,7 +228,13 @@
<path> <path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" /> <item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" /> <item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="doris" type="462c0819:PsiDirectoryNode" /> <item name="search" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dymas" type="b2602c69:ProjectViewProjectNode" />
<item name="dymas" type="462c0819:PsiDirectoryNode" />
<item name="search" type="462c0819:PsiDirectoryNode" />
<item name="views" type="462c0819:PsiDirectoryNode" />
</path> </path>
</expand> </expand>
<select /> <select />
...@@ -253,9 +295,9 @@ ...@@ -253,9 +295,9 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-286" y="-1080" width="1920" height="1080" extended-state="0" /> <frame x="-4" y="24" width="1280" height="723" extended-state="6" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.20537125" /> <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.014297062" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info id="DB Browser" order="3" /> <window_info id="DB Browser" order="3" />
...@@ -268,7 +310,7 @@ ...@@ -268,7 +310,7 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="DB Execution Console" order="8" /> <window_info anchor="bottom" id="DB Execution Console" order="8" />
<window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.44455957" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.0" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" /> <window_info anchor="bottom" id="Python Console" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
...@@ -456,15 +498,15 @@ ...@@ -456,15 +498,15 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/doris/devel.py"> <entry file="file://$PROJECT_DIR$/doris/devel.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220"> <state relative-caret-position="130">
<caret line="43" column="56" selection-start-line="43" selection-start-column="56" selection-end-line="43" selection-end-column="56" /> <caret line="37" column="24" lean-forward="true" selection-start-line="37" selection-start-column="24" selection-end-line="37" selection-end-column="24" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/doris/log_settings.py"> <entry file="file://$PROJECT_DIR$/doris/log_settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="195">
<caret line="9" column="26" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" /> <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -483,10 +525,38 @@ ...@@ -483,10 +525,38 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258">
<caret line="27" column="13" lean-forward="true" selection-start-line="27" selection-start-column="13" selection-end-line="27" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/rank/forms/interpose.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="229" column="22" selection-start-line="229" selection-start-column="22" selection-end-line="229" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/doris/deploy_devel.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/rank/utils/rpc_data.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-29">
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search/views/sku.py"> <entry file="file://$PROJECT_DIR$/search/views/sku.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="476"> <state relative-caret-position="-2792">
<caret line="90" selection-start-line="90" selection-end-line="90" /> <caret line="73" column="29" selection-start-line="73" selection-start-column="7" selection-end-line="73" selection-end-column="29" />
<folding> <folding>
<element signature="e#24#52#0" expanded="true" /> <element signature="e#24#52#0" expanded="true" />
<element signature="e#1704#2757#0" /> <element signature="e#1704#2757#0" />
...@@ -504,13 +574,6 @@ ...@@ -504,13 +574,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/requirements.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="24" column="15" selection-start-line="24" selection-start-column="15" selection-end-line="24" selection-end-column="15" />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
search/views/sku.py
View file @ e607b958
...@@ -71,7 +71,7 @@ def _get_query_sku_ids(redis_service_sr_key, city_service_dict, sku_ids, org_ids ...@@ -71,7 +71,7 @@ def _get_query_sku_ids(redis_service_sr_key, city_service_dict, sku_ids, org_ids
# @param filters 过滤条件 # @param filters 过滤条件
# @param sort_params 排序条件 # @param sort_params 排序条件
# @date 20170709 # @date 20170709
@bind('doris/search/query_sku') @bind('dymas/search/query_sku')
def query_sku(query='', user_city_tag_id=None, offset=0, size=2, def query_sku(query='', user_city_tag_id=None, offset=0, size=2,
sort_type=SERVICE_ORDER_TYPE.DEFAULT, filters={}, sort_params={}, or_filters=[], query_type="default"): sort_type=SERVICE_ORDER_TYPE.DEFAULT, filters={}, sort_params={}, or_filters=[], query_type="default"):
if sort_type == SERVICE_ORDER_TYPE.DEFAULT_REALTIME: if sort_type == SERVICE_ORDER_TYPE.DEFAULT_REALTIME:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment