From 780578502875aa0c339cb73f11b1e635df458c77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期三, 28 二月 2024 14:55:05 +0800
Subject: [PATCH] 系统调整
---
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 75 insertions(+), 26 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
index 612bef2..141653b 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java
@@ -12,16 +12,20 @@
import com.yuanchu.mom.pojo.FansSubmit;
import com.yuanchu.mom.pojo.FinanceSubmit;
import com.yuanchu.mom.service.DataReportingService;
+import com.yuanchu.mom.service.FansSubmitService;
import com.yuanchu.mom.service.FinanceSubmitService;
import com.yuanchu.mom.mapper.FinanceSubmitMapper;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -52,35 +56,80 @@
@Override
public int delFinanceSubmit(Integer id) {
- return financeSubmitMapper.deleteById(id);
- }
-
- @Override
- public int updateFinanceSubmit(FinanceSubmit financeSubmit) {
- DataReporting reporting = dataReportingMapper.selectById(financeSubmit.getDataId());
- reporting.setId(financeSubmit.getDataId());
- reporting.setAgentRebate(financeSubmit.getEmployeeRebate());
- try {
- reporting.setDiscountedConsumption(reporting.getConsumption().divide(reporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- dataReportingMapper.updateById(reporting);
- return financeSubmitMapper.updateById(financeSubmit);
- }
-
- @Override
- public int addFinanceSubmit(FinanceSubmit financeSubmit, String date) {
- if(date == null) date = getYesterday();
- DataReporting dataReporting = dataReportingMapper.selectOne(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).eq(DataReporting::getCreateUser, getLook.selectPowerByMethodAndUserId("selectRegistrantCountDtoPageList").get("userId")).like(DataReporting::getCreateTime, date));
- if(ObjectUtil.isEmpty(dataReporting)){
- throw new ErrorException(date+" 璐︽埛锛�"+financeSubmit.getName()+" 浠ｇ悊鍟嗭細"+financeSubmit.getCompany()+" 骞舵湭涓婃姤杩�");
+ FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getId, id).select(FinanceSubmit::getEmployeeRebate,FinanceSubmit::getName,FinanceSubmit::getCompany,FinanceSubmit::getCreateTime,FinanceSubmit::getDataId));
+ financeSubmitMapper.deleteById(id);
+ FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).eq(FinanceSubmit::getDataId, financeSubmit.getDataId()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).orderByDesc(FinanceSubmit::getId).last("limit 1"));
+ if(ObjectUtil.isEmpty(financeSubmit2)){
+ return 1;
+ };
+ List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).eq(DataReporting::getCreateUser, financeSubmit.getDataId()).like(DataReporting::getCreateTime, financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setAgentRebate(financeSubmit2.getEmployeeRebate());
+ dataReportingMapper.updateById(computingMethod(dataReporting));
}
- dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
+ return 1;
+ }
+
+ @Override
+ public int updateFinanceSubmit(FinanceSubmit financeSubmit3) {
+ financeSubmitMapper.updateById(financeSubmit3);
+ FinanceSubmit financeSubmit = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getId, financeSubmit3.getId()).select(FinanceSubmit::getEmployeeRebate,FinanceSubmit::getName,FinanceSubmit::getCompany,FinanceSubmit::getCreateTime,FinanceSubmit::getDataId));
+ FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).eq(FinanceSubmit::getDataId, financeSubmit.getDataId()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, financeSubmit.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))).orderByDesc(FinanceSubmit::getId).last("limit 1"));
+ if(ObjectUtil.isEmpty(financeSubmit2))return 1;
+ List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).eq(DataReporting::getCreateUser, financeSubmit.getDataId()).like(DataReporting::getCreateTime, financeSubmit.getCreateTime().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setAgentRebate(financeSubmit2.getEmployeeRebate());
+ dataReportingMapper.updateById(computingMethod(dataReporting));
+ }
+ return 1;
+ }
+
+ public DataReporting computingMethod(DataReporting dataReporting){
+ try {
+ dataReporting.setRebateConsumption(dataReporting.getAccountConsumption().divide(dataReporting.getCustomerRebate(), 2, RoundingMode.HALF_UP));
+ } catch (Exception e) {
+ }
+ try {
+ dataReporting.setConsumption(dataReporting.getCustomerCosts().multiply(BigDecimal.valueOf(dataReporting.getFansAdd())));
+ } catch (Exception e) {
+ }
try {
dataReporting.setDiscountedConsumption(dataReporting.getConsumption().divide(dataReporting.getAgentRebate(), 2, RoundingMode.HALF_UP));
- }catch (Exception e){}
- dataReportingMapper.updateById(dataReporting);
- financeSubmit.setDataId(dataReporting.getId());
- return financeSubmitMapper.insert(financeSubmit);
+ } catch (Exception e) {
+ }
+ try {
+ dataReporting.setActualCost(dataReporting.getAccountConsumption().divide(new BigDecimal(dataReporting.getFansAdd()), 2, RoundingMode.HALF_UP));
+ } catch (Exception e) {
+ }
+ try {
+ dataReporting.setProfit(dataReporting.getRebateConsumption().subtract(dataReporting.getConsumption()));
+ } catch (Exception e) {
+ }
+ return dataReporting;
+ }
+
+ @Override
+ public int addFinanceSubmit(FinanceSubmit financeSubmit, String date, String param) {
+ if(date == null) date = getYesterday();
+// financeSubmit.setDataId(Integer.parseInt(param));
+ String date2 = null;
+ if(date == null) {
+ date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ date2 = getYesterday();
+ }else{
+ date = LocalDateTime.parse(date + "T00:00:00").plusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ date2 = LocalDateTime.parse(date + "T00:00:00").minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ financeSubmit.setCreateTime(LocalDateTime.parse(date + "T00:00:00"));
+ }
+ financeSubmitMapper.insert(financeSubmit);
+ FinanceSubmit financeSubmit2 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).select(FinanceSubmit::getEmployeeRebate).like(FinanceSubmit::getCreateTime, date).orderByDesc(FinanceSubmit::getId).last("limit 1"));
+ if(ObjectUtil.isEmpty(financeSubmit2))return 1;
+ List<DataReporting> dataReportings = dataReportingMapper.selectList(Wrappers.<DataReporting>lambdaQuery().eq(DataReporting::getAgent, financeSubmit.getCompany()).eq(DataReporting::getName, financeSubmit.getName()).like(DataReporting::getCreateTime, date2));
+ for (DataReporting dataReporting : dataReportings) {
+ dataReporting.setAgentRebate(financeSubmit2.getEmployeeRebate());
+ dataReportingMapper.updateById(computingMethod(dataReporting));
+ }
+ return 1;
}
public String getYesterday(){
--
Gitblit v1.9.3