app排序

.idea/workspace.xml

@@ -4,8 +4,6 @@
     <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/common/service/impl/ContractServiceImpl.java" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" afterPath="$PROJECT_DIR$/src/main/java/track/controller/TrackAccountController.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -59,8 +57,8 @@
       <file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1746">
-              <caret line="260" column="71" lean-forward="true" selection-start-line="260" selection-start-column="71" selection-end-line="260" selection-end-column="71" />
+            <state relative-caret-position="-5697">
+              <caret line="150" column="53" lean-forward="false" selection-start-line="150" selection-start-column="53" selection-end-line="150" selection-end-column="53" />
               <folding />
             </state>
           </provider>
@@ -1319,14 +1317,7 @@
       <workItem from="1516932422302" duration="5866000" />
       <workItem from="1517189406074" duration="8333000" />
       <workItem from="1517275427548" duration="11524000" />
-      <workItem from="1517361892578" duration="5092000" />
-    </task>
-    <task id="LOCAL-00019" summary="pom">
-      <created>1515032955423</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1515032955423</updated>
+      <workItem from="1517361892578" duration="5791000" />
     </task>
     <task id="LOCAL-00020" summary="pom">
       <created>1515034078195</created>
@@ -1664,11 +1655,18 @@
       <option name="project" value="LOCAL" />
       <updated>1517381123222</updated>
     </task>
-    <option name="localTasksCounter" value="68" />
+    <task id="LOCAL-00068" summary="app排序">
+      <created>1517382900046</created>
+      <option name="number" value="00068" />
+      <option name="presentableId" value="LOCAL-00068" />
+      <option name="project" value="LOCAL" />
+      <updated>1517382900046</updated>
+    </task>
+    <option name="localTasksCounter" value="69" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="302902000" />
+    <option name="totallyTimeSpent" value="303601000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -2276,8 +2274,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1746">
-          <caret line="260" column="71" lean-forward="true" selection-start-line="260" selection-start-column="71" selection-end-line="260" selection-end-column="71" />
+        <state relative-caret-position="-5697">
+          <caret line="150" column="53" lean-forward="false" selection-start-line="150" selection-start-column="53" selection-end-line="150" selection-end-column="53" />
           <folding />
         </state>
       </provider>

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -148,19 +148,19 @@ public class ContractServiceImpl implements ContractService{
 
         boolean newRebat = false;
         if(!resource.getPriceLevel().equals(contract.getPriceLevel())){
-            cc.setContent(cc.getContent() +  "  " + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getPriceLevel()));
+            cc.setContent(cc.getContent() +  "  套餐变更：" + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getPriceLevel()));
             newRebat = true;
             contract.setPriceLevel(resource.getPriceLevel());
         }
 
         if(!resource.getMoney().equals(contract.getMoney())){
-            cc.setContent(cc.getContent() + "   金额 " + contract.getMoney() + "-->金额 " + resource.getMoney());
+            cc.setContent(cc.getContent() + "   金额变更： " + contract.getMoney() + "-->" + resource.getMoney());
             newRebat = true;
             contract.setMoney(resource.getMoney());
         }
 
         if(!resource.getSale().equals(contract.getSale())){
-            cc.setContent(cc.getContent() + "   销售 " + saleMap.get(contract.getSale()) + "-->销售 " + saleMap.get(resource.getSale()));
+            cc.setContent(cc.getContent() + "销售变更：" + saleMap.get(contract.getSale()) + "-->" + saleMap.get(resource.getSale()));
             contract.setSale(resource.getSale());
         }
 
@@ -258,8 +258,8 @@ public class ContractServiceImpl implements ContractService{
         Map<Long, String> saleMap = getSaleMap();
         Contract contract = contractRepository.findByCode(resource.getContractCode());
         if(resource.getType().equals("price")){
-            resource.setContent("  " + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getLevel())
-                    + " 金额" + contract.getMoney() + "--> 金额 " +(resource.getMoney() + contract.getMoney()));
+            resource.setContent("套餐变更 ：" + packageMap.get(contract.getPriceLevel()) + "-->" + packageMap.get(resource.getLevel())
+                    + " 金额变更 ：" + contract.getMoney() + "-->" +(resource.getMoney() + contract.getMoney()));
 
             contract.setMoney(resource.getMoney() + contract.getMoney());
             contract.setPriceLevel(resource.getLevel());