From d0c3258ed4871f2b9f03357bfd39b6caeff156b0 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期二, 09 一月 2024 11:07:59 +0800
Subject: [PATCH] 修订版3.0
---
data-server/src/main/java/com/yuanchu/mom/service/impl/FinanceSubmitServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 3c4bd95..612bef2 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
@@ -11,12 +11,14 @@
import com.yuanchu.mom.pojo.DataReporting;
import com.yuanchu.mom.pojo.FansSubmit;
import com.yuanchu.mom.pojo.FinanceSubmit;
+import com.yuanchu.mom.service.DataReportingService;
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.RoundingMode;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
@@ -55,17 +57,27 @@
@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()).like(DataReporting::getCreateTime, date));
+ 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()+" 骞舵湭涓婃姤杩�");
+ throw new ErrorException(date+" 璐︽埛锛�"+financeSubmit.getName()+" 浠ｇ悊鍟嗭細"+financeSubmit.getCompany()+" 骞舵湭涓婃姤杩�");
}
dataReporting.setAgentRebate(financeSubmit.getEmployeeRebate());
+ 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);
--
Gitblit v1.9.3