Skip to content

M
manager
Commit 83f8e98d by kangxiaoshan
Options

大后台更新3

parent 2871f2df
Showing with 147 additions and 68 deletions
.idea/workspace.xml
......@@ -7,16 +7,8 @@
</component>
<component name="ChangeListManager">
<list default="true" id="a014dff6-23ae-4886-96e2-e6af5bd7ea48" 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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/Contract.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -27,29 +19,78 @@
</component>
<component name="FileEditorManager">
<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$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="209" column="40" lean-forward="true" selection-start-line="209" selection-start-column="40" selection-end-line="209" selection-end-column="40" />
<state relative-caret-position="224">
<caret line="273" column="95" selection-start-line="273" selection-start-column="87" selection-end-line="273" selection-end-column="95" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="e#1612#1671#0" />
<element signature="method#findAll#0;class#ContractController#0" />
<element signature="e#1993#2106#0" />
<element signature="method#export#0;class#ContractController#0" />
<element signature="e#2882#3464#1" />
<element signature="e#2927#3454#1" />
<element signature="e#3556#3615#0" />
<element signature="e#3638#3682#0" />
<element signature="e#4331#4448#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="e#5139#5509#1" />
<element signature="e#5186#5499#1" />
<element signature="e#5601#5660#0" />
<element signature="e#5683#5727#0" />
<element signature="e#6475#6537#0" />
<element signature="method#findOne#0;class#ContractController#0" />
<element signature="e#6716#6783#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="e#7015#7079#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="e#7391#7455#0" />
<element signature="e#7605#7669#0" />
<element signature="method#findCode#0;class#ContractController#0" />
<element signature="e#7920#7990#0" />
<element signature="method#findPricelevel#0;class#ContractController#0" />
<element signature="e#8188#8257#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="e#8417#8482#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="e#8764#8828#0" />
<element signature="e#8976#9038#0" />
<element signature="method#create#0;class#ContractController#0" />
<element signature="e#9692#9753#0" />
<element signature="method#update#0;class#ContractController#0" />
<element signature="e#10304#10363#0" />
<element signature="method#pay#0;class#ContractController#0" />
<element signature="e#10918#10980#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="e#11537#11600#0" />
<element signature="method#findPay#0;class#ContractController#0" />
<element signature="e#11892#11958#0" />
<element signature="method#findChange#0;class#ContractController#0" />
<element signature="e#12259#12324#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="e#12921#12987#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
<element signature="e#13293#13354#0" />
<element signature="method#build#0;class#ContractController#0" />
<element signature="e#13844#13908#0" />
<element signature="method#contractCodeAll#0;class#ContractController#0" />
</folding>
</state>
</provider>
</entry>
</file>
<file 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="148">
<caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/service/impl/AccountFlowRestrictServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="268">
......@@ -67,15 +108,17 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file 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">
<state relative-caret-position="333">
<caret line="534" column="58" lean-forward="true" selection-start-line="534" selection-start-column="58" selection-end-line="534" selection-end-column="58" />
<state relative-caret-position="29">
<caret line="182" column="26" lean-forward="true" selection-start-line="182" selection-start-column="26" selection-end-line="182" selection-end-column="26" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
<element signature="e#2786#4190#0" />
<element signature="e#4196#5419#0" />
<element signature="e#5476#5477#0" expanded="true" />
<element signature="e#5531#5532#0" expanded="true" />
<element signature="e#25880#27874#0" />
<element signature="e#27880#28654#0" />
<element signature="e#28660#29443#0" />
......@@ -105,8 +148,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="38" column="34" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
<state relative-caret-position="272">
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
<folding>
<element signature="e#5322#5323#0" expanded="true" />
<element signature="e#5357#5358#0" expanded="true" />
......@@ -144,15 +187,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/tkio/model/IncrementFlow.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="80">
<caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
......@@ -167,6 +201,7 @@
<find>flow.setContractCode</find>
<find>find/pricelevel</find>
<find>增值</find>
<find>find/body</find>
</findStrings>
</component>
<component name="Git.Settings">
......@@ -179,11 +214,12 @@
<option value="$PROJECT_DIR$/src/main/java/common/controller/LoginController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/UserServiceImpl.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/ContractRelation.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRelationRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/common/repository/ContractRepository.java" />
<option value="$PROJECT_DIR$/src/main/java/tkio/controller/TkioAccountController.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/common/service/ContractService.java" />
<option value="$PROJECT_DIR$/src/main/java/common/controller/ContractController.java" />
<option value="$PROJECT_DIR$/src/main/java/common/model/Contract.java" />
<option value="$PROJECT_DIR$/src/main/java/common/service/impl/ContractServiceImpl.java" />
</list>
......@@ -461,7 +497,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="12487000" />
<option name="totallyTimeSpent" value="14618000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
......@@ -600,13 +636,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="33" column="22" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/City.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="128">
......@@ -839,10 +868,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/service/ContractService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="148">
<caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/model/Contract.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="38" column="34" selection-start-line="38" selection-start-column="34" selection-end-line="38" selection-end-column="34" />
<state relative-caret-position="272">
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
<folding>
<element signature="e#5322#5323#0" expanded="true" />
<element signature="e#5357#5358#0" expanded="true" />
......@@ -852,34 +888,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="209" column="40" lean-forward="true" selection-start-line="209" selection-start-column="40" selection-end-line="209" selection-end-column="40" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="method#findPay#0;class#ContractController#0" />
<element signature="method#findChange#0;class#ContractController#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
</folding>
</state>
</provider>
</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="333">
<caret line="534" column="58" lean-forward="true" selection-start-line="534" selection-start-column="58" selection-end-line="534" selection-end-column="58" />
<state relative-caret-position="29">
<caret line="182" column="26" lean-forward="true" selection-start-line="182" selection-start-column="26" selection-end-line="182" selection-end-column="26" />
<folding>
<element signature="docComment;class#ContractServiceImpl#0" />
<element signature="e#2786#4190#0" />
<element signature="e#4196#5419#0" />
<element signature="e#5476#5477#0" expanded="true" />
<element signature="e#5531#5532#0" expanded="true" />
<element signature="e#25880#27874#0" />
<element signature="e#27880#28654#0" />
<element signature="e#28660#29443#0" />
......@@ -896,5 +914,65 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/common/controller/ContractController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="224">
<caret line="273" column="95" selection-start-line="273" selection-start-column="87" selection-end-line="273" selection-end-column="95" />
<folding>
<element signature="docComment;class#ContractController#0" />
<element signature="e#1612#1671#0" />
<element signature="method#findAll#0;class#ContractController#0" />
<element signature="e#1993#2106#0" />
<element signature="method#export#0;class#ContractController#0" />
<element signature="e#2882#3464#1" />
<element signature="e#2927#3454#1" />
<element signature="e#3556#3615#0" />
<element signature="e#3638#3682#0" />
<element signature="e#4331#4448#0" />
<element signature="method#exportPay#0;class#ContractController#0" />
<element signature="e#5139#5509#1" />
<element signature="e#5186#5499#1" />
<element signature="e#5601#5660#0" />
<element signature="e#5683#5727#0" />
<element signature="e#6475#6537#0" />
<element signature="method#findOne#0;class#ContractController#0" />
<element signature="e#6716#6783#0" />
<element signature="method#checkAccount#0;class#ContractController#0" />
<element signature="e#7015#7079#0" />
<element signature="method#checkTime#0;class#ContractController#0" />
<element signature="e#7391#7455#0" />
<element signature="e#7605#7669#0" />
<element signature="method#findCode#0;class#ContractController#0" />
<element signature="e#7920#7990#0" />
<element signature="method#findPricelevel#0;class#ContractController#0" />
<element signature="e#8188#8257#0" />
<element signature="method#findIncrement#0;class#ContractController#0" />
<element signature="e#8417#8482#0" />
<element signature="method#rebat#0;class#ContractController#0" />
<element signature="e#8764#8828#0" />
<element signature="e#8976#9038#0" />
<element signature="method#create#0;class#ContractController#0" />
<element signature="e#9692#9753#0" />
<element signature="method#update#0;class#ContractController#0" />
<element signature="e#10304#10363#0" />
<element signature="method#pay#0;class#ContractController#0" />
<element signature="e#10918#10980#0" />
<element signature="method#change#0;class#ContractController#0" />
<element signature="e#11537#11600#0" />
<element signature="method#findPay#0;class#ContractController#0" />
<element signature="e#11892#11958#0" />
<element signature="method#findChange#0;class#ContractController#0" />
<element signature="e#12259#12324#0" />
<element signature="method#updatePay#0;class#ContractController#0" />
<element signature="e#12921#12987#0" />
<element signature="method#findPayAll#0;class#ContractController#0" />
<element signature="e#13293#13354#0" />
<element signature="method#build#0;class#ContractController#0" />
<element signature="e#13844#13908#0" />
<element signature="method#contractCodeAll#0;class#ContractController#0" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
src/main/java/common/controller/ContractController.java
......@@ -269,17 +269,17 @@ public class ContractController {
return ResultModel.OK(service.build(contract));
}
@RequestMapping(value = "trade", method = RequestMethod.POST)
@RequestMapping(value = "trade", method = RequestMethod.GET)
@ResponseBody
public ResultModel baseCreate(@RequestBody Contract contract, @PathVariable String platform) {
public ResultModel baseCreate( @PathVariable String platform) {
return ResultModel.OK(service.getTradeData(platform));
}
@RequestMapping(value = "code/all", method = RequestMethod.POST)
@RequestMapping(value = "code/all", method = RequestMethod.GET)
@ResponseBody
public ResultModel contractCodeAll(@RequestBody Contract contract, @PathVariable String platform) {
public ResultModel contractCodeAll( @PathVariable String platform) {
return ResultModel.OK(service.contractCodeAll(platform));
}
......
src/main/java/common/model/Contract.java
......@@ -20,7 +20,7 @@ public class Contract {
private String email; //客户主账号
private String contractCode;
//是否首次签约
private String contractType;
private String contractType; // 0 首次签约 1 续签 2 合同变更
private String startDate;
private String endDate;
//套餐
......@@ -53,7 +53,7 @@ public class Contract {
private Boolean virtual;
/**
* 新增字段
* 新增字段 20190427
*/
private Long discountFlow; // 优惠流量
private Long discountTimeLong; // 优惠时长
......
src/main/java/common/service/impl/ContractServiceImpl.java
......@@ -180,10 +180,10 @@ public class ContractServiceImpl implements ContractService{
int codeInt = countContract.intValue();
if(codeInt < 9){
lastCode = "0"+(codeInt+1);
}else{
lastCode = ""+(codeInt+1);
if (codeInt < 9) {
lastCode = "0" + (codeInt + 1);
} else {
lastCode = "" + (codeInt + 1);
}
return (company + "-" + platform + "-" + DateUtil.getDays2(0) + "-" + lastCode).toUpperCase();
}
......
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