diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 031e532..d482602 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" afterPath="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,16 +32,6 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="ContractService.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="575">
-              <caret line="29" column="13" lean-forward="false" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -97,8 +87,8 @@
       <file leaf-file-name="ADIAccountController.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="457">
-              <caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
+            <state relative-caret-position="321">
+              <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
               <folding />
             </state>
           </provider>
@@ -107,29 +97,43 @@
       <file leaf-file-name="ADIAccountService.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="194">
-              <caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
+            <state relative-caret-position="183">
+              <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ADIAccountServiceImpl.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="ADIAccountServiceImpl.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" />
+            <state relative-caret-position="242">
+              <caret line="279" column="17" lean-forward="false" selection-start-line="279" selection-start-column="17" selection-end-line="279" selection-end-column="17" />
+              <folding>
+                <element signature="e#6234#6235#0" expanded="true" />
+                <element signature="e#6301#6302#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ADISaleMapRepository.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/office/repository/ADISaleMapRepository.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="345">
+              <caret line="17" column="20" lean-forward="true" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="68" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ADIUser.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="ADIUser.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" />
+            <state relative-caret-position="242">
+              <caret line="33" column="30" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="30" />
               <folding>
+                <element signature="e#1498#1499#0" expanded="true" />
                 <element signature="e#1526#1527#0" expanded="true" />
                 <element signature="e#1569#1570#0" expanded="true" />
                 <element signature="e#1603#1604#0" expanded="true" />
@@ -154,8 +158,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>reyun</find>
-      <find>\t</find>
       <find>rebat</find>
       <find>contractChangeRepository</find>
       <find>contractMoneyRepository</find>
@@ -184,6 +186,8 @@
       <find>port</find>
       <find>http://localhost:8081</find>
       <find>&quot;http://localhost:8081</find>
+      <find>closeFloat</find>
+      <find>bussinessMan</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -254,8 +258,8 @@
         <option value="$PROJECT_DIR$/src/main/java/common/model/BPUContract.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/repository/BPUContractRepository.java" />
         <option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
-        <option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" />
+        <option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -1049,13 +1053,6 @@
       <workItem from="1526609390549" duration="37000" />
       <workItem from="1528173363272" duration="91000" />
     </task>
-    <task id="LOCAL-00094" summary="客户表&#10;&#10;&#10;">
-      <created>1522059374814</created>
-      <option name="number" value="00094" />
-      <option name="presentableId" value="LOCAL-00094" />
-      <option name="project" value="LOCAL" />
-      <updated>1522059374814</updated>
-    </task>
     <task id="LOCAL-00095" summary="客户表&#10;&#10;&#10;">
       <created>1522060257128</created>
       <option name="number" value="00095" />
@@ -1392,11 +1389,18 @@
       <option name="project" value="LOCAL" />
       <updated>1528275338074</updated>
     </task>
-    <option name="localTasksCounter" value="143" />
+    <task id="LOCAL-00143" summary="adi">
+      <created>1528276207718</created>
+      <option name="number" value="00143" />
+      <option name="presentableId" value="LOCAL-00143" />
+      <option name="project" value="LOCAL" />
+      <updated>1528276207718</updated>
+    </task>
+    <option name="localTasksCounter" value="144" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="543062000" />
+    <option name="totallyTimeSpent" value="544879000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -1554,13 +1558,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/UserController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="54" column="27" lean-forward="true" selection-start-line="54" selection-start-column="27" selection-end-line="54" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/service/UserService.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="194">
@@ -1909,35 +1906,36 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/office/repository/ADISaleMapRepository.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="457">
-          <caret line="57" column="54" lean-forward="false" selection-start-line="57" selection-start-column="54" selection-end-line="57" selection-end-column="54" />
+        <state relative-caret-position="345">
+          <caret line="17" column="20" lean-forward="true" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="68" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/adi/controller/ADIAccountController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
+        <state relative-caret-position="321">
+          <caret line="32" column="52" lean-forward="true" selection-start-line="32" selection-start-column="52" selection-end-line="32" selection-end-column="52" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/ADIAccountService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="147" column="21" lean-forward="true" selection-start-line="147" selection-start-column="21" selection-end-line="147" selection-end-column="21" />
+        <state relative-caret-position="183">
+          <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="51" column="31" lean-forward="false" selection-start-line="51" selection-start-column="31" selection-end-line="51" selection-end-column="31" />
+        <state relative-caret-position="242">
+          <caret line="33" column="30" lean-forward="false" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="30" />
           <folding>
+            <element signature="e#1498#1499#0" expanded="true" />
             <element signature="e#1526#1527#0" expanded="true" />
             <element signature="e#1569#1570#0" expanded="true" />
             <element signature="e#1603#1604#0" expanded="true" />
@@ -1949,6 +1947,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="279" column="17" lean-forward="false" selection-start-line="279" selection-start-column="17" selection-end-line="279" selection-end-column="17" />
+          <folding>
+            <element signature="e#6234#6235#0" expanded="true" />
+            <element signature="e#6301#6302#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/adi/service/impl/ADIAccountServiceImpl.java b/src/main/java/adi/service/impl/ADIAccountServiceImpl.java
index 8bdd1c1..09a19ae 100644
--- a/src/main/java/adi/service/impl/ADIAccountServiceImpl.java
+++ b/src/main/java/adi/service/impl/ADIAccountServiceImpl.java
@@ -179,6 +179,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
                     System.out.println(object);
                     val = new ObjectMapper().readValue(object, ADIUser.class);
                     System.out.println(val);
+                    val.setPackageType("试用套餐");
                     if(dicContract.containsKey(val.getEmail())){
                         Contract contract = dicContract.get(val.getEmail());
                         String date = DateUtil.format(val.getExpriedTime(), "yyyy-MM-dd");
@@ -275,6 +276,7 @@ public class ADIAccountServiceImpl implements ADIAccountService {
                 }
                 if (saleMap.containsKey(aw.getSaleEamil())) {
                     aw.setSale(saleMap.get(aw.getSaleEamil()));
+                    aw.setBussinessMan(saleMap.get(aw.getSaleEamil()) );
                 }
                 aw.setStatus(statusMap.get(aw.getStatus()));
                 aw.setPastDate(null == aw.getExpriedTime() ? "" :DateUtil.getFormatDate(aw.getExpriedTime()));