增加订单配置信息

.idea/workspace.xml

@@ -2,12 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a191bf23-5de1-438a-810e-95cec23d6b25" name="Default" comment="change fastjson dependenciy">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/OrderService/src/test/java/com/java110/order/jsonpath/CustIdTest.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ActionTypeConstant.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/DomainContant.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/StatusConstant.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/listener/CustDispatchListener.java" afterPath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/listener/CustDispatchListener.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" afterPath="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java" afterPath="$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/user/UserServiceFallback.java" afterPath="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/user/UserServiceFallback.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/db/orders.db" afterPath="$PROJECT_DIR$/config/db/orders.db" />
+      <change type="MOVED" beforePath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ItemSpecCdConstant.java" afterPath="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/AttrCdConstant.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -41,31 +42,59 @@
       <file leaf-file-name="OrderServiceSMOImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="847">
-              <caret line="323" column="20" lean-forward="true" selection-start-line="323" selection-start-column="20" selection-end-line="323" selection-end-column="20" />
+            <state relative-caret-position="153">
+              <caret line="339" column="0" lean-forward="false" selection-start-line="339" selection-start-column="0" selection-end-line="340" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="UserServiceSMOImpl.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java">
+      <file leaf-file-name="AttrCdConstant.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/AttrCdConstant.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="204">
-              <caret line="207" column="85" lean-forward="false" selection-start-line="207" selection-start-column="55" selection-end-line="207" selection-end-column="85" />
+            <state relative-caret-position="62">
+              <caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CustDispatchListener.java" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/listener/CustDispatchListener.java">
+      <file leaf-file-name="orders.db" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/config/db/orders.db">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="130">
-              <caret line="64" column="52" lean-forward="false" selection-start-line="64" selection-start-column="52" selection-end-line="64" selection-end-column="52" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state relative-caret-position="340">
+              <caret line="77" column="74" lean-forward="false" selection-start-line="77" selection-start-column="74" selection-end-line="77" selection-end-column="74" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ActionTypeConstant.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ActionTypeConstant.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="419">
+              <caret line="57" column="59" lean-forward="false" selection-start-line="57" selection-start-column="59" selection-end-line="57" selection-end-column="60" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="IOrderServiceDao.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/dao/IOrderServiceDao.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="368">
+              <caret line="71" column="27" lean-forward="false" selection-start-line="71" selection-start-column="27" selection-end-line="71" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="UserServiceSMOImpl.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="17">
+              <caret line="216" column="21" lean-forward="false" selection-start-line="216" selection-start-column="21" selection-end-line="216" selection-end-column="21" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -73,8 +102,18 @@
       <file leaf-file-name="AppContext.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/src/main/java/com/java110/core/context/AppContext.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-391">
-              <caret line="35" column="36" lean-forward="true" selection-start-line="35" selection-start-column="36" selection-end-line="35" selection-end-column="36" />
+            <state relative-caret-position="17">
+              <caret line="35" column="36" lean-forward="false" selection-start-line="35" selection-start-column="36" selection-end-line="35" selection-end-column="36" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="DomainContant.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/DomainContant.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="153">
+              <caret line="9" column="47" lean-forward="false" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" />
               <folding />
             </state>
           </provider>
@@ -107,6 +146,7 @@
       <find>propertyResolver</find>
       <find>defaultProperties</find>
       <find>ApplicationContextInitializer</find>
+      <find>queryBusiOrderAndAttr</find>
     </findStrings>
     <replaceStrings>
       <replace>microcommunity.version</replace>
@@ -126,12 +166,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/core/src/main/java/com/java110/core/event/Java110Event.java" />
-        <option value="$PROJECT_DIR$/core/src/main/java/com/java110/core/event/Java110Listener.java" />
-        <option value="$PROJECT_DIR$/core/src/main/java/com/java110/core/event/Ordered.java" />
-        <option value="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/listener/MerchantDispatchListener.java" />
-        <option value="$PROJECT_DIR$/config/src/main/resources/META-INF/spring.factories" />
-        <option value="$PROJECT_DIR$/core/src/main/java/com/java110/listener/CustDispatchListener.java" />
         <option value="$PROJECT_DIR$/OrderService/src/test/java/com/java110/order/type/TestListener.java" />
         <option value="$PROJECT_DIR$/OrderService/src/test/java/com/java110/order/type/CustDispatchListener.java" />
         <option value="$PROJECT_DIR$/OrderService/src/test/java/com/java110/order/type/TypeTest.java" />
@@ -172,11 +206,17 @@
         <option value="$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/IUserServiceSMO.java" />
         <option value="$PROJECT_DIR$/UserService/src/main/java/com/java110/user/rest/UserServiceRest.java" />
         <option value="$PROJECT_DIR$/common/src/main/java/com/java110/common/util/ProtocolUtil.java" />
-        <option value="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" />
         <option value="$PROJECT_DIR$/feign/src/main/java/com/java110/feign/user/UserServiceFallback.java" />
         <option value="$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java" />
         <option value="$PROJECT_DIR$/OrderService/src/test/java/com/java110/order/jsonpath/CustIdTest.java" />
         <option value="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/listener/CustDispatchListener.java" />
+        <option value="$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/OrderConstant.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/AttrCdConstant.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/StatusConstant.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/DomainContant.java" />
+        <option value="$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ActionTypeConstant.java" />
+        <option value="$PROJECT_DIR$/config/db/orders.db" />
       </list>
     </option>
   </component>
@@ -269,8 +309,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="Scratches" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -379,9 +419,105 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="MicroCommunity" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="main" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="java" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="common" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="constant" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -858,7 +994,9 @@
       <workItem from="1492867295880" duration="9001000" />
       <workItem from="1492937288686" duration="4367000" />
       <workItem from="1492949070139" duration="9099000" />
-      <workItem from="1492996563145" duration="4810000" />
+      <workItem from="1492996563145" duration="7757000" />
+      <workItem from="1493010153618" duration="1117000" />
+      <workItem from="1493018952770" duration="3874000" />
     </task>
     <task id="LOCAL-00001" summary="change fastjson dependenciy">
       <created>1491576589634</created>
@@ -903,7 +1041,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="300365000" />
+    <option name="totallyTimeSpent" value="308303000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -911,28 +1049,28 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.37821484" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29836065" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6229508" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6213115" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25189108" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30983606" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32786885" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29836065" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32817337" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.30983606" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -992,48 +1130,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="jar://$M2_REPO$/org/springframework/spring-jms/4.3.2.RELEASE/spring-jms-4.3.2.RELEASE-sources.jar!/org/springframework/jms/core/JmsTemplate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="52" column="82" lean-forward="false" selection-start-line="52" selection-start-column="71" selection-end-line="52" selection-end-column="82" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$M2_REPO$/org/springframework/spring-jms/4.3.2.RELEASE/spring-jms-4.3.2.RELEASE-sources.jar!/org/springframework/jms/core/JmsMessagingTemplate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2306">
-          <caret line="45" column="33" lean-forward="false" selection-start-line="45" selection-start-column="13" selection-end-line="45" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/AppSpringBootApplication.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="26" column="28" lean-forward="false" selection-start-line="26" selection-start-column="28" selection-end-line="26" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$M2_REPO$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE.jar!/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$M2_REPO$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfiguration.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="43" column="28" lean-forward="false" selection-start-line="43" selection-start-column="28" selection-end-line="43" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$M2_REPO$/org/springframework/boot/spring-boot-autoconfigure/1.4.0.RELEASE/spring-boot-autoconfigure-1.4.0.RELEASE-sources.jar!/org/springframework/boot/autoconfigure/jms/JmsAutoConfiguration.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="46" column="13" lean-forward="false" selection-start-line="46" selection-start-column="13" selection-end-line="46" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/OrderService/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -1076,27 +1172,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/dao/IOrderServiceDao.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1054">
-          <caret line="71" column="27" lean-forward="false" selection-start-line="71" selection-start-column="27" selection-end-line="71" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/dao/impl/OrderServiceDaoImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1496">
-          <caret line="102" column="65" lean-forward="false" selection-start-line="102" selection-start-column="46" selection-end-line="102" selection-end-column="65" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config/src/main/resources/mapper/order/OrderServiceDaoImplMapper.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1751">
-          <caret line="103" column="51" lean-forward="false" selection-start-line="103" selection-start-column="51" selection-end-line="103" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/OrderService/src/test/java/com/java110/order/type/AppEvent.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="289">
@@ -1122,7 +1197,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
           <caret line="9" column="13" lean-forward="false" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1169,7 +1243,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1230,7 +1303,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-895">
           <caret line="51" column="5" lean-forward="true" selection-start-line="51" selection-start-column="5" selection-end-line="51" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1285,15 +1357,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1241">
           <caret line="49" column="13" lean-forward="false" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="847">
-          <caret line="323" column="20" lean-forward="true" selection-start-line="323" selection-start-column="20" selection-end-line="323" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1301,7 +1364,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="232">
           <caret line="27" column="89" lean-forward="false" selection-start-line="27" selection-start-column="89" selection-end-line="27" selection-end-column="89" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1309,7 +1371,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
           <caret line="28" column="5" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="28" selection-end-column="5" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1333,15 +1394,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="193">
           <caret line="44" column="13" lean-forward="false" selection-start-line="44" selection-start-column="13" selection-end-line="44" selection-end-column="13" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="207" column="85" lean-forward="false" selection-start-line="207" selection-start-column="55" selection-end-line="207" selection-end-column="85" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1349,7 +1401,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-23">
           <caret line="20" column="6" lean-forward="true" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1357,30 +1408,113 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="218">
           <caret line="23" column="0" lean-forward="true" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/src/main/resources/mapper/order/OrderServiceDaoImplMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="91" column="37" lean-forward="false" selection-start-line="91" selection-start-column="16" selection-end-line="91" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/dao/impl/OrderServiceDaoImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="428">
+          <caret line="102" column="46" lean-forward="false" selection-start-line="102" selection-start-column="46" selection-end-line="102" selection-end-column="65" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core/src/main/java/com/java110/core/context/AppContext.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-391">
-          <caret line="35" column="36" lean-forward="true" selection-start-line="35" selection-start-column="36" selection-end-line="35" selection-end-column="36" />
+        <state relative-caret-position="17">
+          <caret line="35" column="36" lean-forward="false" selection-start-line="35" selection-start-column="36" selection-end-line="35" selection-end-column="36" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/CommonConstant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/listener/CustDispatchListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="130">
-          <caret line="64" column="52" lean-forward="false" selection-start-line="64" selection-start-column="52" selection-end-line="64" selection-end-column="52" />
+        <state relative-caret-position="521">
+          <caret line="69" column="0" lean-forward="false" selection-start-line="69" selection-start-column="0" selection-end-line="69" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/UserService/src/main/java/com/java110/user/smo/impl/UserServiceSMOImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="216" column="21" lean-forward="false" selection-start-line="216" selection-start-column="21" selection-end-line="216" selection-end-column="21" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/DomainContant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="9" column="47" lean-forward="false" selection-start-line="9" selection-start-column="47" selection-end-line="9" selection-end-column="47" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/AttrCdConstant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="62">
+          <caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/StatusConstant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="7" selection-end-line="22" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="339" column="0" lean-forward="false" selection-start-line="339" selection-start-column="0" selection-end-line="340" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/OrderService/src/main/java/com/java110/order/dao/IOrderServiceDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="71" column="27" lean-forward="false" selection-start-line="71" selection-start-column="27" selection-end-line="71" selection-end-column="27" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/common/src/main/java/com/java110/common/constant/ActionTypeConstant.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="419">
+          <caret line="57" column="59" lean-forward="false" selection-start-line="57" selection-start-column="59" selection-end-line="57" selection-end-column="60" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config/db/orders.db">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="340">
+          <caret line="77" column="74" lean-forward="false" selection-start-line="77" selection-start-column="74" selection-end-line="77" selection-end-column="74" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

OrderService/src/main/java/com/java110/order/smo/impl/OrderServiceSMOImpl.java

@@ -226,10 +226,13 @@ public class OrderServiceSMOImpl extends BaseServiceSMO implements IOrderService
         AppContext context = createApplicationContext();
 
         prepareContext(context, datasTmp);
-
-        //发布事件
-        AppEventPublishing.multicastEvent(context,datasTmp,orderListTmp.getString("asyn"));
-
+        try {
+            //发布事件
+            AppEventPublishing.multicastEvent(context,datasTmp,orderListTmp.getString("asyn"));
+        }catch (Exception e){
+            //这里补偿事物
+            throw e;
+        }
         return ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_SUCCESS,"成功",JSONObject.parseObject(JSONObject.toJSONString(orderList)));
     }
 
@@ -313,12 +316,28 @@ public class OrderServiceSMOImpl extends BaseServiceSMO implements IOrderService
          */
         Assert.isNull(busiOrderTmps,"入参错误，没有busiOrder 节点，或没有子节点");
 
-        if(!busiOrderTmps.getJSONObject(0).containsKey("oldBoId")){
+        List<Map<String,String>> needDeleteBoIds = new ArrayList<Map<String,String>>();
+
+        if(busiOrderTmps.getJSONObject(0).containsKey("actionTypeCd")){
            String actionTypeCds = busiOrderTmps.getJSONObject(0).getString("actionTypeCd");
-            deleteOrderByActionTypeCd(orderListTmp.getString("oldOlId"),actionTypeCds.split(","));
-            return ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_SUCCESS,"成功",JSONObject.parseObject(JSONObject.toJSONString(orderList)));
+            getNeeddeleteOrderByActionTypeCd(orderListTmp.getString("oldOlId"),needDeleteBoIds,actionTypeCds.split(","));
+            //return ProtocolUtil.createResultMsg(ProtocolUtil.RETURN_MSG_SUCCESS,"成功",JSONObject.parseObject(JSONObject.toJSONString(orderList)));
+        }else if(busiOrderTmps.getJSONObject(0).containsKey("oldBoId")){
+            Map<String,String> oldBoIdMap = null;
+            for(int busiOrderIndex = 0; busiOrderIndex< busiOrderTmps.size();busiOrderIndex++){
+                oldBoIdMap = new HashMap<String, String>();
+                oldBoIdMap.put("actionTypeCd","");
+                oldBoIdMap.put("boId",busiOrderTmps.getJSONObject(busiOrderIndex).getString("oldBoId"));
+                oldBoIdMap.put("olId","");
+                needDeleteBoIds.add(oldBoIdMap);
+            }
+        }else {
+            throw new IllegalArgumentException("当前系统只支持busiOrder 节点下第一个节点包含 actionTypeCd节点和 oldOlId节点的报文："+orderInfo);
         }
 
+        //添加数据至 busi_order,这里生成新的boId 将需要作废的boId信息写入值busi_order_attr 中单独注册一个属性信息
+
+
 
 
         return null;
@@ -330,7 +349,7 @@ public class OrderServiceSMOImpl extends BaseServiceSMO implements IOrderService
      * @param actionTypeCd busi_order action_type_cd 类型来作废订单
      * @throws Exception
      */
-    private void deleteOrderByActionTypeCd(String oldOlId,String ...actionTypeCd) throws Exception{
+    private void getNeeddeleteOrderByActionTypeCd(String oldOlId,List<Map<String,String>> needDeleteBoIds,String ...actionTypeCd) throws Exception{
         //根据oldOdId actionTypeCd 获取订单项
         BusiOrder busiOrderTmp = new BusiOrder();
         busiOrderTmp.setOlId(oldOlId);
@@ -343,13 +362,30 @@ public class OrderServiceSMOImpl extends BaseServiceSMO implements IOrderService
         // 'C1','A1','M1'
         actionTypeCds = actionTypeCds.endsWith(",")?actionTypeCds.substring(0,actionTypeCds.length()-1):actionTypeCds;
 
-        busiOrderTmp.setActionTypeCd(actionTypeCds);
-
-        List<BusiOrder> busiOrders =  iOrderServiceDao.queryBusiOrderAndAttr(busiOrderTmp);
+        //如果为 ALL 作废整个订单数据，这里直接传为空 根据olId 处理
+        if("ALL".equals(actionTypeCds)){
 
-        Assert.isNull(busiOrders,"没有找到需要作废的订单，[oldOdId="+oldOlId+",actionTypeCd = "+actionTypeCd+"]");
+            actionTypeCds = "";
+        }
 
+        busiOrderTmp.setActionTypeCd(actionTypeCds);
 
+        /**
+         * 已经生成的订单项信息
+         */
+        List<BusiOrder> oldBusiOrders =  iOrderServiceDao.queryBusiOrderAndAttr(busiOrderTmp);
+
+        Assert.isNull(oldBusiOrders,"没有找到需要作废的订单，[oldOdId="+oldOlId+",actionTypeCd = "+actionTypeCd+"]");
+
+        //作废老订单信息
+        Map<String,String> oldBoIdMap = null;
+        for(BusiOrder oldBusiOrder : oldBusiOrders){
+            oldBoIdMap = new HashMap<String, String>();
+            oldBoIdMap.put("actionTypeCd",oldBusiOrder.getActionTypeCd());
+            oldBoIdMap.put("boId",oldBusiOrder.getBoId());
+            oldBoIdMap.put("olId",oldBusiOrder.getOlId());
+            needDeleteBoIds.add(oldBoIdMap);
+        }
     }
 
     private void prepareContext(AppContext context,Map<String,JSONArray> datasTmp){

common/src/main/java/com/java110/common/constant/ActionTypeConstant.java

@@ -0,0 +1,59 @@
+package com.java110.common.constant;
+
+/**
+ * 订单动作定义类
+ * Created by wuxw on 2017/4/24.
+ */
+public class ActionTypeConstant {
+
+    /**
+     * 添加客户信息
+     */
+    public final static String ACTION_TYPE_ADD_CUST = "C1";
+
+    /**
+     * 修改客户信息
+     */
+    public final static String ACTION_TYPE_EDIT_CUST = "C2";
+
+    /**
+     * 删除客户信息
+     */
+    public final static String ACTION_TYPE_DEL_CUST = "C3";
+
+    /**
+     * 添加账户信息
+     */
+    public final static String ACTION_TYPE_ADD_ACCOUNT = "A1";
+
+    /**
+     * 修改账户信息
+     */
+    public final static String ACTION_TYPE_EDIT_ACCOUNT = "A2";
+
+    /**
+     * 删除账户信息
+     */
+    public final static String ACTION_TYPE_DEL_ACCOUNT = "A3";
+
+    /**
+     * 增加商户信息
+     */
+    public final static String ACTION_TYPE_ADD_MERCHANT = "M1";
+
+    /**
+     * 编辑商户信息
+     */
+    public final static String ACTION_TYPE_EDIT_MERCHANT = "M2";
+
+    /**
+     * 删除商户信息
+     */
+    public final static String ACTION_TYPE_DEL_MERCHANT = "M3";
+
+
+    /**
+     * 撤单
+     */
+    public final static String ACTION_TYPE_CANCEL_ORDER = "D";
+}

common/src/main/java/com/java110/common/constant/AttrCdConstant.java

@@ -0,0 +1,31 @@
+package com.java110.common.constant;
+
+/**
+ *
+ * Item_spec_cd 取值代表含义
+ * Created by wuxw on 2016/12/27.
+ */
+public class AttrCdConstant {
+
+    /**
+     * 用于busi_order_attr 中 Attr_cd 表示为要作废订单项 boId
+     */
+    public final static String BUSI_ORDER_ATTR_10000001 = "10000001";//用于busi_order_attr 中 Attr_cd 表示为要作废订单项 boId
+
+    /**
+     * 用于order_list_attr 中的Attr_cd 表示为要作废购物车olId
+     */
+    public final static String ORDER_LIST_ATTR_10000002 = "10000002";//用于order_list_attr 中的Attr_cd 表示为要作废购物车olId
+
+
+
+
+
+
+
+
+
+
+
+
+}

common/src/main/java/com/java110/common/constant/DomainContant.java

@@ -0,0 +1,25 @@
+package com.java110.common.constant;
+
+/**
+ * 域常量定义类
+ *
+ * 域变量生成方式为：
+ *
+ * DOMAIN.+表名称
+ *
+ * 表示这个域专属于这个表的域，不管是status 还是 attr 还是其他需要用到域的地方
+ * Created by wuxw on 2017/4/24.
+ */
+public class DomainContant {
+
+    /************************************ITEM_DOMAIN START****************************************/
+
+    public final static String ATTR_DOMAIN_PROD="DOMAIN.PROD";//产品域
+    public final static String ATTR_DOMAIN_OFFER="DOMAIN.OFFER";//销售品域
+    public final static String ATTR_DOMAIN_ORDER_LIST="DOMAIN.ORDER_LIST";//购物车域
+    public final static String ATTR_DOMAIN_BUSI_ORDER="DOMAIN.BUSI_ORDER";//订单项域
+    public final static String ATTR_DOMAIN_CUST="DOMAIN.CUST";//客户域
+    public final static String ATTR_DOMAIN_ACCOUNT="DOMAIN.ACCOUNT";//账户域
+
+    /************************************ITEM_DOMAIN END****************************************/
+}

common/src/main/java/com/java110/common/constant/ItemSpecCdConstant.java

@@ -1,27 +0,0 @@
-package com.java110.common.constant;
-
-/**
- *
- * Item_spec_cd 取值代表含义
- * Created by wuxw on 2016/12/27.
- */
-public class ItemSpecCdConstant {
-
-    /************************************ITEM_DOMAIN START****************************************/
-
-    public final static String ITEM_DOMAIN_PROD="DOMAIN.PROD";//产品域
-    public final static String ITEM_DOMAIN_OFFER="DOMAIN.OFFER";//销售品域
-    public final static String ITEM_DOMAIN_ORDER_LIST="DOMAIN.ORDER_LIST";//购物车域
-    public final static String ITEM_DOMAIN_BUSI_ORDER="DOMAIN.BUSI_ORDER";//订单项域
-    public final static String ITEM_DOMAIN_CUST="DOMAIN.CUST";//客户域
-    public final static String ITEM_DOMAIN_ACCOUNT="DOMAIN.ACCOUNT";//账户域
-
-    /************************************ITEM_DOMAIN END****************************************/
-
-
-
-
-
-
-
-}

common/src/main/java/com/java110/common/constant/StatusConstant.java

@@ -0,0 +1,26 @@
+package com.java110.common.constant;
+
+/**
+ * 封装订单
+ * Created by wuxw on 2017/4/24.
+ */
+public class StatusConstant {
+
+
+    /**
+     * 保存数据成功
+     */
+    public final static String STATUS_CD_SAVE = "S";//保存成功
+
+
+
+    /**
+     * 有效的，在用的
+     */
+    public final static String STATUS_CD_VALID = "0";
+
+    /**
+     * 无效的，不在用的
+     */
+    public final static String STATUS_CD_INVALID = "1";
+}

config/db/orders.db

@@ -58,32 +58,58 @@ create table busi_order_attr(
 
 -- 动作类型表
 create table action_type(
-    id int not null,
+    id int not null AUTO_INCREMENT,
     actionTypeCd varchar(10) not null comment '业务动作编码',
     name varchar(200) not null comment '业务动作名称',
     describe varchar(500) not null comment '业务动作描述',
-    serviceCd varchar(10) not null comment '业务动作隶属于那个服务,U1 客户服务，M2 账户服务',
-    create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+    create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    primary key (id)
 );
 
+insert into action_type(actionTypeCd,name,describe) values('C1','添加客户信息','添加客户信息');
+insert into action_type(actionTypeCd,name,describe) values('C2','修改客户信息','修改客户信息');
+insert into action_type(actionTypeCd,name,describe) values('C3','删除客户信息','删除客户信息');
+insert into action_type(actionTypeCd,name,describe) values('A1','添加账户信息','添加账户信息');
+insert into action_type(actionTypeCd,name,describe) values('A2','修改账户信息','修改账户信息');
+insert into action_type(actionTypeCd,name,describe) values('A3','删除账户信息','删除账户信息');
+insert into action_type(actionTypeCd,name,describe) values('M1','增加商户信息','增加商户信息');
+insert into action_type(actionTypeCd,name,describe) values('M2','编辑商户信息','编辑商户信息');
+insert into action_type(actionTypeCd,name,describe) values('M3','删除商户信息','删除商户信息');
+insert into action_type(actionTypeCd,name,describe) values('D','撤单','撤单');
+
+
 
 -- 数据状态字典表
 create table status(
-    id int not null,
+    id int not null  AUTO_INCREMENT,
+    domain varchar(20) not null comment '属性域，CUST 客户域 ORDER_LIST 购物车域 BUSI_ORDER 订单项域'
     status_cd varchar(20),
     name varchar(200) not null comment '状态名称',
     describe varchar(500) not null comment '状态描述',
-    create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+    create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    primary key (id)
 );
 
+insert into status(domain,status_cd,name,describe) values('DOMAIN.ORDER_LIST','S','保存数据成功','保存数据成功');
+insert into status(domain,status_cd,name,describe) values('DOMAIN.ORDER_LIST','0','有效的','有效的');
+insert into status(domain,status_cd,name,describe) values('DOMAIN.ORDER_LIST','1','无效的','无效的');
+
+insert into status(domain,status_cd,name,describe) values('DOMAIN.BUSI_ORDER','S','保存数据成功','保存数据成功');
+insert into status(domain,status_cd,name,describe) values('DOMAIN.BUSI_ORDER','0','有效的','有效的');
+insert into status(domain,status_cd,name,describe) values('DOMAIN.BUSI_ORDER','1','无效的','无效的');
+
 -- 属性字典表
 
 create table attr(
-    id int not null,
+    id int not null  AUTO_INCREMENT ,
     domain varchar(20) not null comment '属性域，CUST 客户域 ORDER_LIST 购物车域 BUSI_ORDER 订单项域'
     attrCd varchar(20) not null comment '属性编码',
      name varchar(200) not null comment '属性名称',
      describe varchar(500) not null comment '属性描述',
-     create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+     create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+     primary key (id)
 );
 
+
+insert into attr(domain,attrCd,name,describe) values('DOMAIN.ORDER_LIST','10000002','作废购物车olId','作废购物车olId');
+insert into attr(domain,attrCd,name,describe) values('DOMAIN.BUSI_ORDER','10000001','作废订单项boId','作废订单项boId');