|
@@ -204,8 +204,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
row.createCell(0).setCellValue(vo.getDate());
|
|
|
row.createCell(1).setCellValue(vo.getAccountName());
|
|
|
row.createCell(2).setCellValue(vo.getAdvertiserId());
|
|
|
- row.createCell(3).setCellValue("北京汇创思拓数字科技有限公司-ka");
|
|
|
- row.createCell(4).setCellValue("73970348172");
|
|
|
+ row.createCell(3).setCellValue(vo.getAgentName());
|
|
|
+ row.createCell(4).setCellValue(vo.getAgentId());
|
|
|
row.createCell(5).setCellValue(vo.getCost());
|
|
|
row.createCell(6).setCellValue(vo.getCashCost());
|
|
|
row.createCell(7).setCellValue(vo.getRewardCost());
|
|
@@ -567,7 +567,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
List<String> policyDaysList = new ArrayList<>();
|
|
|
if (!Check.isNull(map.get("productName"))){
|
|
|
//查询 头条利润表 返点类型和比列
|
|
|
- List<Map<String,Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("productName")+"","1",paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
+ List<Map<String,Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName")+"",slaeMap.get("saleId")+"","1",paramsVo.getStartTime(),paramsVo.getEndTime());
|
|
|
List listPolicyTIme = new ArrayList();
|
|
|
for (Map<String, Object> rate : rateMap) {
|
|
|
listPolicyTIme.add(rate.get("policyStartDate"));
|
|
@@ -589,7 +589,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
for (Map<String, String> stringMap : arrayList) {
|
|
|
ProfitReportBytedanceVo vo = new ProfitReportBytedanceVo();
|
|
|
//使用政策 返点类型和比例
|
|
|
- Map<String,Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName")+"",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
|
+ Map<String,Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("advertiserName")+"",map.get("productName")+"",slaeMap.get("saleId")+"","1",stringMap.get("startDate"),stringMap.get("endDate"));
|
|
|
if (!Check.isNull(policyRateMap)){
|
|
|
if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 0){
|
|
|
vo.setRebateType("返现");//返点类型
|
|
@@ -725,7 +725,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
List<String> policyDaysList = new ArrayList<>();
|
|
|
if (!Check.isNull(map.get("productName"))) {
|
|
|
//查询 快手利润表 返点类型和比列
|
|
|
- List<Map<String, Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("productName") + "", "2", paramsVo.getStartTime(), paramsVo.getEndTime());
|
|
|
+ List<Map<String, Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName") + "", slaeMap.get("saleId")+"","2", paramsVo.getStartTime(), paramsVo.getEndTime());
|
|
|
List listPolicyTIme = new ArrayList();
|
|
|
for (Map<String, Object> rate : rateMap) {
|
|
|
listPolicyTIme.add(rate.get("policyStartDate"));
|
|
@@ -749,7 +749,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
for (Map<String, String> stringMap : arrayList) {
|
|
|
ProfitReportKuaiShouVo vo = new ProfitReportKuaiShouVo();
|
|
|
//使用政策 返点类型和比例
|
|
|
- Map<String, Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
+ Map<String, Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("advertiserName")+"",map.get("productName") + "", slaeMap.get("saleId")+"","2",stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
if (!Check.isNull(policyRateMap)) {
|
|
|
if (Integer.valueOf(policyRateMap.get("rebateType").toString()) == 0) {
|
|
|
vo.setRebateType("返现");//返点类型
|
|
@@ -800,11 +800,9 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
vo.setTime(!Check.isNull(vo.getRebateType()) ? stringMap.get("startDate") + "----" + stringMap.get("endDate") : "");
|
|
|
resultList.add(vo);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("快手利润单", "快手利润单"), ProfitReportKuaiShouVo.class, resultList);
|
|
|
-
|
|
|
try {
|
|
|
response.setCharacterEncoding("UTF-8");
|
|
|
response.setHeader("content-Type", "application/vnd.ms-excel");
|
|
@@ -813,7 +811,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
} catch (IOException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
}
|
|
|
-
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
return Result.errorMsg(e.getMessage());
|
|
@@ -838,7 +835,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
int accountNum = 0;
|
|
|
String productInfo = null;
|
|
|
String message = "{0},您好!您{1}月份有{2}个产品的账户需要进行媒体后台消耗截图上传,共计{3}个账户。产品分别为:{4}。请及时上传,多谢配合!";
|
|
|
-
|
|
|
//查询所有 运营绑定的账户
|
|
|
List<Map<String,Object>> userList = reportSettlementMapper.getAccountOperateUserId();
|
|
|
for (Map<String, Object> userMap : userList) {
|
|
@@ -853,7 +849,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
productNum = product.size();
|
|
|
accountNum = productList.size();
|
|
|
productInfo = StringUtils.join(product.toArray(),"、");
|
|
|
-
|
|
|
//发送微信通知
|
|
|
JSONObject jsonObject = mailLogMapper.getWChatIdByUserId(userId);
|
|
|
String msg = MessageFormat.format(message,userMap.get("userName").toString(),month,productNum,accountNum,productInfo);
|
|
@@ -885,7 +880,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
productNum = product.size();
|
|
|
accountNum = productList.size();
|
|
|
productInfo = StringUtils.join(product.toArray(),"、");
|
|
|
-
|
|
|
//发送微信通知
|
|
|
JSONObject jsonObject = mailLogMapper.getWChatIdByUserId(Check.isNull(userId) ? "f990f815ecef43fab9cbe1bb22bb6d63" : userId);
|
|
|
String msg = MessageFormat.format(message,userMap.get("userName").toString(),month,productNum,accountNum,productInfo);
|
|
@@ -897,17 +891,14 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
@Resource
|
|
|
private CwjsPolicyProductMapper cwjsPolicyProductMapper;
|
|
|
|
|
|
-
|
|
|
@Override
|
|
|
public void cwjsPRofit(CwjsPolicyInfo cwjsPolicyInfo) {
|
|
|
-
|
|
|
// 获取两个日期之间 所有的 时间 年-月-日
|
|
|
List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes(cwjsPolicyInfo.getPolicyStartDate(),cwjsPolicyInfo.getPolicyEndDate());
|
|
|
//查看 政策下的产品
|
|
|
List<CwjsPolicyProduct> productList = cwjsPolicyProductMapper.queryProductsByPolicyId(cwjsPolicyInfo.getId());
|
|
|
if (!Check.isNull(productList)){
|
|
|
if (!Check.isNull(betweenDaysList)){
|
|
|
-
|
|
|
List<CtopCwjsSlettementReport> reportList = new ArrayList<>();
|
|
|
for (CwjsPolicyProduct product : productList) {
|
|
|
for (String day : betweenDaysList) {
|
|
@@ -927,9 +918,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
@Resource
|
|
|
private CwjsPolicyInfoMapper cwjsPolicyInfoMapper;
|
|
|
@Resource
|
|
@@ -937,8 +925,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
@Resource
|
|
|
private CwjsCompanySubjectMapper cwjsCompanySubjectMapper;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
@Override
|
|
|
public Result importPolicyInit(MultipartFile file) {
|
|
|
try {
|
|
@@ -946,7 +932,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
//settlementInfo.setCreateUserId(user.getId());
|
|
|
//settlementInfo.setCreateUserId("b161b7d9793942f980dbfe8c931cd1b0");
|
|
|
ImportParams importParams = new ImportParams();
|
|
|
-
|
|
|
//表头行数
|
|
|
importParams.setHeadRows(1);
|
|
|
|
|
@@ -955,17 +940,13 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
return Result.error("读取Excel失败,数据不能为空,请重新检查数据并导入");
|
|
|
}
|
|
|
|
|
|
-
|
|
|
for (PolicyImportVo importVo : importResult.getList()) {
|
|
|
if (cn.com.ctop.common.module.utils.Check.isNull(importVo.getCompanyName())){
|
|
|
continue;
|
|
|
}
|
|
|
-
|
|
|
if (cn.com.ctop.common.module.utils.Check.isNull(importVo.getPolicyProductName())){
|
|
|
continue;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
List<String> productNameList = Arrays.asList(importVo.getPolicyProductName().split("-"));
|
|
|
|
|
|
CwjsPolicyInfo cwjsPolicyInfo = new CwjsPolicyInfo();
|
|
@@ -986,10 +967,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
CwjsCompanySubject companySubject = cwjsCompanySubjectMapper.selectOne(companySubQw);
|
|
|
cwjsPolicyInfo.setCompanySubjectId(companySubject.getId());
|
|
|
|
|
|
-
|
|
|
cwjsPolicyInfo.setApprovedStatus(3);
|
|
|
|
|
|
-
|
|
|
CwjsPolicyInfo policy = cwjsPolicyInfoMapper.getPolicyInfo(cwjsPolicyInfo);
|
|
|
|
|
|
if (cn.com.ctop.common.module.utils.Check.isNull(policy)){
|
|
@@ -1000,9 +979,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
//查看 政策下的产品
|
|
|
List<CwjsPolicyProduct> productList = cwjsPolicyProductMapper.queryProductsByPolicyId(policy.getId());
|
|
|
List proList = productList.stream().map(CwjsPolicyProduct:: getPolicyProductName).collect(Collectors.toList());
|
|
|
-
|
|
|
for (String str : productNameList) {
|
|
|
-
|
|
|
if (!proList.contains(str)){
|
|
|
//新增产品
|
|
|
CwjsPolicyProduct policyProduct = new CwjsPolicyProduct();
|
|
@@ -1013,12 +990,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
cwjsPolicyProductMapper.insert(policyProduct);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
this.cwjsPRofit(policy);
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
return Result.error("政策数据上传失败,请使用正确的模板导入!");
|
|
@@ -1029,4 +1002,5 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|