diff --git a/src/main/java/common/controller/ContractController.java b/src/main/java/common/controller/ContractController.java
index 986ef10..6107b84 100644
--- a/src/main/java/common/controller/ContractController.java
+++ b/src/main/java/common/controller/ContractController.java
@@ -31,10 +31,7 @@ import java.io.*;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.DecimalFormat;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Created by mxq on 17/12/21.
@@ -135,10 +132,13 @@ public class ContractController {
//创建工作表的行
HSSFRow row = sheet.createRow(0);
- List<String> title = Arrays.asList("录入时间,合同编号,客户账号,我方签约主体,签约方,行政区域,隶属集团,行业分类,销售,开始日期,结束日期,套餐类型,合同金额,签约类型,合同状态,回款状态,关联合同"
- .split(","));
+ List<String> title;
if(platform.equals("tkio")){
- title.add("总点击次数(万次)");
+ title = Arrays.asList("录入时间,合同编号,客户账号,我方签约主体,签约方,行政区域,隶属集团,行业分类,销售,开始日期,结束日期,套餐类型,合同流量(万次),赠送流量(万次),合同金额,签约类型,合同状态,回款状态,关联合同"
+ .split(","));
+ }else{
+ title = Arrays.asList("录入时间,合同编号,客户账号,我方签约主体,签约方,行政区域,隶属集团,行业分类,销售,开始日期,结束日期,套餐类型,合同金额,签约类型,合同状态,回款状态,关联合同"
+ .split(","));
}
int lineSize = title.size();
for (int i = 0; i < lineSize; i++) {
@@ -160,14 +160,21 @@ public class ContractController {
rowBody.createCell(9).setCellValue(contract.getStartDate());
rowBody.createCell(10).setCellValue(contract.getEndDate());
rowBody.createCell(11).setCellValue(contract.getPriceLevelName());
- rowBody.createCell(12).setCellValue(contract.getMoney());
- rowBody.createCell(13).setCellValue(CONTRACT_STATUS.get(contract.getContractType()));
- rowBody.createCell(14).setCellValue(CONTRACT_STATUS.get(contract.getStatus()));
- rowBody.createCell(15).setCellValue(CONTRACT_STATUS.get(contract.getBackStatus() + "_back"));
- rowBody.createCell(16).setCellValue(contract.getRelationCode() == null ? "" : contract.getRelationCode());
- if(platform.equals("tkio")){
- rowBody.createCell(17).setCellValue(contract.getTrackFlow());
+ if(platform.equals("tkio")){
+ rowBody.createCell(12).setCellValue(contract.getTrackFlow());
+ rowBody.createCell(13).setCellValue(contract.getExtraFlow());
+ rowBody.createCell(14).setCellValue(contract.getMoney());
+ rowBody.createCell(15).setCellValue(CONTRACT_STATUS.get(contract.getContractType()));
+ rowBody.createCell(16).setCellValue(CONTRACT_STATUS.get(contract.getStatus()));
+ rowBody.createCell(17).setCellValue(CONTRACT_STATUS.get(contract.getBackStatus() + "_back"));
+ rowBody.createCell(18).setCellValue(contract.getRelationCode() == null ? "" : contract.getRelationCode());
+ }else{
+ rowBody.createCell(12).setCellValue(contract.getMoney());
+ rowBody.createCell(13).setCellValue(CONTRACT_STATUS.get(contract.getContractType()));
+ rowBody.createCell(14).setCellValue(CONTRACT_STATUS.get(contract.getStatus()));
+ rowBody.createCell(15).setCellValue(CONTRACT_STATUS.get(contract.getBackStatus() + "_back"));
+ rowBody.createCell(16).setCellValue(contract.getRelationCode() == null ? "" : contract.getRelationCode());
}
}
@@ -622,7 +629,7 @@ public class ContractController {
//创建工作表的行
HSSFRow row = sheet.createRow(0);
- List<String> title = Arrays.asList("我方签约主体,签约方,合同编号,行政区域,隶属集团,合同开始日期,合同截止日期,合同状态,合同金额(元),总点击次数(万次),单价(元/万次),区间点击数(万次),区间分摊收入(元),区间调整金额(元),区间总收入(元),累计总收入(元),赠送点击量(万次)"
+ List<String> title = Arrays.asList("我方签约主体,签约方,合同编号,行政区域,隶属集团,合同开始日期,合同截止日期,合同状态,合同金额(元),合同流量(万次),单价(元/万次),区间点击数(万次),区间分摊收入(元),区间调整金额(元),区间总收入(元),累计总收入(元),赠送点击量(万次)"
.split(","));
int lineSize = title.size();
diff --git a/src/main/java/common/service/impl/ContractServiceImpl.java b/src/main/java/common/service/impl/ContractServiceImpl.java
index 8182372..fe52a9c 100644
--- a/src/main/java/common/service/impl/ContractServiceImpl.java
+++ b/src/main/java/common/service/impl/ContractServiceImpl.java
@@ -86,7 +86,8 @@ public class ContractServiceImpl implements ContractService {
put("隶属集团", "belong_group");
put("行业分类", "trade_type");
put("合同金额", "money");
- put("总点击次数", "track_flow");
+ put("合同流量", "track_flow");
+ put("赠送流量", "extra_flow");
put("客户主账号", "email");
put("合同编号", "contract_code");
put("签约类型", "contract_type");
@@ -104,7 +105,8 @@ public class ContractServiceImpl implements ContractService {
put("belong_group", "隶属集团");
put("trade_type", "行业分类");
put("money", "合同金额");
- put("track_flow", "总点击次数");
+ put("track_flow", "合同流量");
+ put("extra_flow", "赠送流量");
put("email", "客户主账号");
put("contract_code", "合同编号");
put("contract_type", "签约类型");
@@ -521,7 +523,7 @@ public class ContractServiceImpl implements ContractService {
resource.setDs(DateUtil.getBeforeDays(0));
- this.saveIncrementFlow(resource, extraFlow);
+ //this.saveIncrementFlow(resource, extraFlow);
this.dealContractStatus(resource, loginUser, "save");
@@ -640,7 +642,7 @@ public class ContractServiceImpl implements ContractService {
IncrementFlow flow = new IncrementFlow();
Account account = accountRepository.findByEmail(resource.getEmail());
flow.setAccount(account.getId());
- flow.setFlow(extraFlow);
+ flow.setFlow(extraFlow*10000);
flow.setEndDate(resource.getEndDate());
flow.setStartDate(resource.getStartDate());
flow.setContractCode(resource.getContractCode());
@@ -713,7 +715,7 @@ public class ContractServiceImpl implements ContractService {
IncrementFlow flow = new IncrementFlow();
Account account = accountRepository.findByEmail(resource.getEmail());
flow.setAccount(account.getId());
- flow.setFlow(extraFlow);
+ flow.setFlow(extraFlow*10000);
flow.setEndDate(resource.getEndDate());
flow.setStartDate(resource.getStartDate());
flow.setContractCode(resource.getContractCode());
@@ -2305,7 +2307,7 @@ public class ContractServiceImpl implements ContractService {
try {
int row_length;
if(platform.equals("tkio")){
- row_length = 14;
+ row_length = 15;
}else{
row_length = 13;
}
@@ -2383,8 +2385,10 @@ public class ContractServiceImpl implements ContractService {
return ResultModel.ERROR(ResultStatus.FORMAT_FILE_ERRO);
}
if(!platform.equals("tkio")){
- titleKey.remove("总点击次数");
+ titleKey.remove("合同流量");
titleKey.remove("track_flow");
+ titleKey.remove("赠送流量");
+ titleKey.remove("extra_flow");
}
int row_already = titleKey.size();
diff --git "a/src/main/webapp/upload/\345\220\210\345\220\214\346\250\241\346\235\277-tkio.xlsx" "b/src/main/webapp/upload/\345\220\210\345\220\214\346\250\241\346\235\277-tkio.xlsx"
index f07ff44..de39b32 100644
Binary files "a/src/main/webapp/upload/\345\220\210\345\220\214\346\250\241\346\235\277-tkio.xlsx" and "b/src/main/webapp/upload/\345\220\210\345\220\214\346\250\241\346\235\277-tkio.xlsx" differ