From 06f256c166529b0c333171f76fd49eec4b66afe3 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期六, 27 四月 2024 20:44:33 +0800 Subject: [PATCH] 功能调整 --- data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 124 ++++++++++++++++++++++++++++++++-------- 1 files changed, 98 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..717f565 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 @@ -1,5 +1,6 @@ package com.yuanchu.mom.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -12,16 +13,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,40 +57,107 @@ @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()+" 浠g悊鍟嗭細"+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")); + } + try { + FinanceSubmit financeSubmit1 = financeSubmitMapper.selectOne(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCompany, financeSubmit.getCompany()).eq(FinanceSubmit::getName, financeSubmit.getName()).like(FinanceSubmit::getCreateTime, date).last("limit 1")); + if(BeanUtil.isEmpty(financeSubmit1)){ + financeSubmitMapper.insert(financeSubmit); + }else{ + financeSubmit1.setConsumption(financeSubmit.getConsumption()); + financeSubmit1.setAgentRebate(financeSubmit.getAgentRebate()); + financeSubmit1.setMoney(financeSubmit.getMoney()); + financeSubmit1.setEmployeeRebate(financeSubmit.getEmployeeRebate()); + financeSubmit1.setEmployeeRebateMoney(financeSubmit.getEmployeeRebateMoney()); + financeSubmitMapper.updateById(financeSubmit1); + } + }catch (Exception e){ + e.printStackTrace(); + } + 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(){ return LocalDate.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); } + + @Override + public void deleteAllFinance(String date) { + List<FinanceSubmit> list = financeSubmitMapper.selectList(Wrappers.<FinanceSubmit>lambdaQuery().eq(FinanceSubmit::getCreateUser, getLook.selectPowerByMethodAndUserId("selectDataReportingList").get("userId")).like(FinanceSubmit::getCreateTime, date).select(FinanceSubmit::getId)); + for (FinanceSubmit financeSubmit : list) { + delFinanceSubmit(financeSubmit.getId()); + } + } } -- Gitblit v1.9.3