Jelajahi Sumber

架构模块 更换saas方账号为正式环境账号
用户模块 修正用户剩余天数获取计算

songfuqiang 2 tahun lalu
induk
melakukan
2ef4f26469

+ 9 - 4
backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/MemberServiceImpl.java

@@ -36,6 +36,8 @@ import utils.RedisUtils;
 import utils.SMSUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Slf4j
@@ -495,23 +497,26 @@ public class MemberServiceImpl implements MemberService {
      */
     public long getLeftDay(List<SubSetPricing> subSetPricingList) {
         long day = 0;
-        long num = 0;
 
         Date now = new Date();
+        BigDecimal normal = new BigDecimal(86400000);
         for (SubSetPricing setPricing : subSetPricingList) {
             if(1 != setPricing.getTargetId()) {
                 Date startDate = setPricing.getStartDate();
                 Date endDate = setPricing.getEndDate();
                 if (endDate.getTime() - now.getTime() > 0) {
                     if (startDate.getTime() - now.getTime() < 0) {
-                        num += endDate.getTime() - now.getTime();
+                        long l = endDate.getTime() - now.getTime();
+                        BigDecimal b1 = new BigDecimal(l);
+                        day += b1.divide(normal,0,RoundingMode.UP).longValue();
                     } else {
-                        num += endDate.getTime() - startDate.getTime();
+                        long l = endDate.getTime() - startDate.getTime();
+                        BigDecimal b1 = new BigDecimal(l);
+                        day += b1.divide(normal,0,RoundingMode.UP).longValue();
                     }
                 }
             }
         }
-        day = num / 24 / 60 / 60 / 1000;//除以一天的毫秒数
         return day;
     }
 

+ 2 - 2
backend-core/src/main/resources/application-test.yml

@@ -84,9 +84,9 @@ ali:
 com:
   pdf:
     kit:
-      address: http://101.132.103.13:8090/server
+      address: https://api-cn-east-1.17pdf.com/server
       projectKey: 17PDF
-      secretKey: 17PDF@123
+      secretKey: secret_key_34bea3f5af15e55d15f91d31025f8d55
 
 17pdf:
   oss: