From b8ce447a6b6bd678831c39514f6a8a716a253b58 Mon Sep 17 00:00:00 2001 From: wujingtao Date: Wed, 15 Jun 2022 13:29:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=9A=E8=AF=9D=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CallCostServiceImpl.java | 19 +++++++++++++------ ...itory.java => PayComboUserRepository.java} | 4 ++-- .../impl/PayTemplateUserServiceImpl.java | 12 ++++++------ 3 files changed, 21 insertions(+), 14 deletions(-) rename manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/{PayTemplateUserRepository.java => PayComboUserRepository.java} (71%) diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java index b714fdf8..e2dec729 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/settlement/service/impl/CallCostServiceImpl.java @@ -15,7 +15,7 @@ import com.baiye.modules.system.domain.User; import com.baiye.modules.system.repository.PayComboRepository; import com.baiye.modules.system.domain.*; import com.baiye.modules.system.repository.PayFatherTemplateRepository; -import com.baiye.modules.system.repository.PayTemplateUserRepository; +import com.baiye.modules.system.repository.PayComboUserRepository; import com.baiye.modules.system.repository.UserRepository; import com.baiye.modules.system.service.CompanyService; import com.baiye.modules.system.service.OrganizeService; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class CallCostServiceImpl implements CallCostService { - private final PayTemplateUserRepository payTemplateUserRepository; + private final PayComboUserRepository payComboUserRepository; private final PayComboRepository payComboRepository; private final CallCostRepository callCostRepository; @@ -67,7 +67,7 @@ public class CallCostServiceImpl implements CallCostService { //查看这些人员 在套餐时间内 的总时长是否超出 注意套餐 是否已经刷新，重新计算 //1.查看当前日期是否在套餐时间范围， //2.查看前一天扣减表。有数据说明已经超出，做扣减，入库-- - List byDay = payTemplateUserRepository.findByDay(DateUtil.today()); + List byDay = payComboUserRepository.findByDay(DateUtil.today()); if (byDay.size() <= 0) { return; } @@ -208,9 +208,16 @@ public class CallCostServiceImpl implements CallCostService { int sumScore = 0; int sumTimes = 0; - for (int i = 1; i < collect.size() - 1; i++) { - sumScore += collect.get(i); - sumTimes++; + if (collect.size() > 2) { + for (int i = 1; i < collect.size() - 1; i++) { + sumScore += collect.get(i); + sumTimes++; + } + } else { + for (Long aLong : collect) { + sumScore += aLong; + sumTimes++; + } } return NumberUtil.mul((double) (sumScore / sumTimes), price.doubleValue()); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboUserRepository.java similarity index 71% rename from manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java rename to manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboUserRepository.java index 6ca703b1..250490a7 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayTemplateUserRepository.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/PayComboUserRepository.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository; import java.util.List; @Repository -public interface PayTemplateUserRepository extends JpaRepository, JpaSpecificationExecutor { +public interface PayComboUserRepository extends JpaRepository, JpaSpecificationExecutor { List findByUserId(Long userId); @@ -28,6 +28,6 @@ public interface PayTemplateUserRepository extends JpaRepository findByDay(String day); } diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java index b62bd9b4..21ad5781 100644 --- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java +++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/PayTemplateUserServiceImpl.java @@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil; import com.baiye.modules.system.domain.PayCombo; import com.baiye.modules.system.domain.PayComboUser; import com.baiye.modules.system.repository.PayComboRepository; -import com.baiye.modules.system.repository.PayTemplateUserRepository; +import com.baiye.modules.system.repository.PayComboUserRepository; import com.baiye.modules.system.repository.UserRepository; import com.baiye.modules.system.service.PayTemplateUserService; import lombok.RequiredArgsConstructor; @@ -27,7 +27,7 @@ import java.util.List; public class PayTemplateUserServiceImpl implements PayTemplateUserService { - private final PayTemplateUserRepository payTemplateUserRepository; + private final PayComboUserRepository payComboUserRepository; private final PayComboRepository payComboRepository; private final UserRepository userRepository; @@ -38,7 +38,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { Long userId = payComboUser.getUserId(); Long payTemplateId = payComboUser.getPayComboId(); if (userId != null && payTemplateId != null) { - List userList = payTemplateUserRepository.findByUserId(userId); + List userList = payComboUserRepository.findByUserId(userId); PayCombo payCombo = payComboRepository.findById(payTemplateId).orElseGet(PayCombo::new); //当前时间 Date createTime = DateUtil.date(); @@ -58,7 +58,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { payComboUserOne.setEndTime(newDate); } userRepository.updateExpirationTimeById(newDate,userId); - return payTemplateUserRepository.save(payComboUserOne).getId() != null; + return payComboUserRepository.save(payComboUserOne).getId() != null; } else { PayComboUser addPayComboUser = new PayComboUser(); addPayComboUser.setPayComboId(payTemplateId); @@ -66,7 +66,7 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { addPayComboUser.setBeginTime(createTime); addPayComboUser.setEndTime(newDate); userRepository.updateExpirationTimeById(newDate, userId); - return payTemplateUserRepository.save(addPayComboUser).getId() != null; + return payComboUserRepository.save(addPayComboUser).getId() != null; } } return Boolean.FALSE; @@ -74,6 +74,6 @@ public class PayTemplateUserServiceImpl implements PayTemplateUserService { @Override public PayComboUser queryUserByUserId(Long id) { - return payTemplateUserRepository.findTemplateByUserId(id); + return payComboUserRepository.findTemplateByUserId(id); } }