修改通话费用获取

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<PayComboUser> byDay = payTemplateUserRepository.findByDay(DateUtil.today());
+        List<PayComboUser> 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++) {
+        if (collect.size() > 2) {
-            sumScore += collect.get(i);
+            for (int i = 1; i < collect.size() - 1; i++) {
-            sumTimes++;
+                sumScore += collect.get(i);
+                sumTimes++;
+            }
+        } else {
+            for (Long aLong : collect) {
+                sumScore += aLong;
+                sumTimes++;
+            }
         }
         return NumberUtil.mul((double) (sumScore / sumTimes), price.doubleValue());
     }

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<PayComboUser, Long>, JpaSpecificationExecutor<PayComboUser> {
+public interface PayComboUserRepository extends JpaRepository<PayComboUser, Long>, JpaSpecificationExecutor<PayComboUser> {
 
     List<PayComboUser> findByUserId(Long userId);
 
@@ -28,6 +28,6 @@ public interface PayTemplateUserRepository extends JpaRepository<PayComboUser, L
      * @param day
      * @return
      */
-    @Query(value = "select * from tb_pay_template_user where  DATE_FORMAT( begin_time, '%Y-%m-%d') < ?1  AND  DATE_FORMAT( end_time, '%Y-%m-%d') > ?1 ", nativeQuery = true)
+    @Query(value = "select * from tb_pay_combo_user where  DATE_FORMAT( begin_time, '%Y-%m-%d') < ?1  AND  DATE_FORMAT( end_time, '%Y-%m-%d') > ?1 ", nativeQuery = true)
     List<PayComboUser> findByDay(String day);
 }

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<PayComboUser> userList = payTemplateUserRepository.findByUserId(userId);
+            List<PayComboUser> 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);
     }
 }