Skip to content

M
manager
Commit 8114d630 by manxiaoqiang
Options

adi

parent 0557ab59
Showing with 35 additions and 35 deletions
.idea/workspace.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e2e217e2-2dd6-4c6f-ad19-b1cba46bc7ad" name="Default" comment=""> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" afterPath="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" /> <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" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractServiceImpl.java" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344"> <state relative-caret-position="252">
<caret line="301" column="38" lean-forward="false" selection-start-line="301" selection-start-column="38" selection-end-line="301" selection-end-column="38" /> <caret line="378" column="24" lean-forward="false" selection-start-line="378" selection-start-column="24" selection-end-line="378" selection-end-column="24" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" /> <element signature="e#5340#5341#0" expanded="true" />
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<element signature="e#7141#7142#0" expanded="true" /> <element signature="e#7141#7142#0" expanded="true" />
<element signature="e#7569#7570#0" expanded="true" /> <element signature="e#7569#7570#0" expanded="true" />
<element signature="e#7618#7619#0" expanded="true" /> <element signature="e#7618#7619#0" expanded="true" />
<element signature="e#30364#30379#0" expanded="true" /> <element signature="e#30405#30420#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ContractController.java" pinned="false" current-in-tab="true"> <file leaf-file-name="ContractController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java"> <entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217"> <state relative-caret-position="217">
...@@ -227,11 +227,11 @@ ...@@ -227,11 +227,11 @@
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractIncrement.java" /> <option value="$PROJECT_DIR$/src/main/java/common/model/ContractIncrement.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/BPUContract.java" /> <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/repository/BPUContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" /> <option value="$PROJECT_DIR$/src/main/java/adi/model/ADIUser.java" />
<option value="$PROJECT_DIR$/src/main/java/office/model/ADISaleMap.java" /> <option value="$PROJECT_DIR$/src/main/java/office/model/ADISaleMap.java" />
<option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/adi/service/impl/ADIAccountServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" /> <option value="$PROJECT_DIR$/src/main/java/util/NewUserLogThread.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
</list> </list>
</option> </option>
</component> </component>
...@@ -1025,13 +1025,6 @@ ...@@ -1025,13 +1025,6 @@
<workItem from="1526609390549" duration="37000" /> <workItem from="1526609390549" duration="37000" />
<workItem from="1528173363272" duration="91000" /> <workItem from="1528173363272" duration="91000" />
</task> </task>
<task id="LOCAL-00097" summary="二版&#10;&#10;&#10;">
<created>1524189027662</created>
<option name="number" value="00097" />
<option name="presentableId" value="LOCAL-00097" />
<option name="project" value="LOCAL" />
<updated>1524189027662</updated>
</task>
<task id="LOCAL-00098" summary="二版&#10;&#10;&#10;"> <task id="LOCAL-00098" summary="二版&#10;&#10;&#10;">
<created>1524206069453</created> <created>1524206069453</created>
<option name="number" value="00098" /> <option name="number" value="00098" />
...@@ -1368,15 +1361,22 @@ ...@@ -1368,15 +1361,22 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1528338974739</updated> <updated>1528338974739</updated>
</task> </task>
<option name="localTasksCounter" value="146" /> <task id="LOCAL-00146" summary="adi">
<created>1528341705933</created>
<option name="number" value="00146" />
<option name="presentableId" value="LOCAL-00146" />
<option name="project" value="LOCAL" />
<updated>1528341705933</updated>
</task>
<option name="localTasksCounter" value="147" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="546933000" /> <option name="totallyTimeSpent" value="547292000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="false" /> <editor active="true" />
<layout> <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="8" side_tool="false" content_ui="tabs" /> <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="8" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" 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="7" side_tool="false" content_ui="tabs" /> <window_info id="Nl-Palette" 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="7" side_tool="false" content_ui="tabs" />
...@@ -1886,23 +1886,6 @@ ...@@ -1886,23 +1886,6 @@
</state> </state>
</provider> </provider>
</entry> </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="344">
<caret line="301" column="38" lean-forward="false" selection-start-line="301" selection-start-column="38" selection-end-line="301" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" />
<element signature="e#5395#5396#0" expanded="true" />
<element signature="e#7114#7115#0" expanded="true" />
<element signature="e#7141#7142#0" expanded="true" />
<element signature="e#7569#7570#0" expanded="true" />
<element signature="e#7618#7619#0" expanded="true" />
<element signature="e#30364#30379#0" expanded="true" />
</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/service/ADIAccountService.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183"> <state relative-caret-position="183">
...@@ -1946,6 +1929,23 @@ ...@@ -1946,6 +1929,23 @@
</state> </state>
</provider> </provider>
</entry> </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="252">
<caret line="378" column="24" lean-forward="false" selection-start-line="378" selection-start-column="24" selection-end-line="378" selection-end-column="24" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#5340#5341#0" expanded="true" />
<element signature="e#5395#5396#0" expanded="true" />
<element signature="e#7114#7115#0" expanded="true" />
<element signature="e#7141#7142#0" expanded="true" />
<element signature="e#7569#7570#0" expanded="true" />
<element signature="e#7618#7619#0" expanded="true" />
<element signature="e#30405#30420#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
src/main/java/common/service/impl/ContractServiceImpl.java
...@@ -376,7 +376,7 @@ public class ContractServiceImpl implements ContractService{ ...@@ -376,7 +376,7 @@ public class ContractServiceImpl implements ContractService{
contract.setSale(resource.getSale()); contract.setSale(resource.getSale());
} }
if(newRebat){ if(newRebat && !"adi".equals(contract.getPlatform())){
Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney()); Double rebat = getRebat(contract.getProduct(), contract.getPriceLevel().intValue(), contract.getMoney());
BigDecimal bg = new BigDecimal(rebat); BigDecimal bg = new BigDecimal(rebat);
double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
......
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