Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_scrm_java

fs-service-system/src/main/java/com/fs/statis/service/impl/StatisticsServiceImpl.java

@@ -57,7 +57,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
         // 完播率
         if(!ObjectUtils.equals(watchUserCount,0L)){
-            BigDecimal multiply = (BigDecimal.valueOf(completedUserCount).divide(BigDecimal.valueOf(watchUserCount))).multiply(BigDecimal.valueOf(100));
+            BigDecimal multiply = (BigDecimal.valueOf(completedUserCount)
+                    .divide(BigDecimal.valueOf(watchUserCount),4,BigDecimal.ROUND_HALF_UP))
+                    .multiply(BigDecimal.valueOf(100));
 
             dto.setCompletedRate(multiply.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString());
         } else {
@@ -81,7 +83,7 @@ public class StatisticsServiceImpl implements IStatisticsService {
         // 视频完播率
         if(!ObjectUtils.equals(watchCount, 0L)){
             BigDecimal multiply = BigDecimal.valueOf(completedCount)
-                    .divide(BigDecimal.valueOf(watchCount))
+                    .divide(BigDecimal.valueOf(watchCount),4,BigDecimal.ROUND_HALF_UP)
                     .multiply(BigDecimal.valueOf(100));
 
             dto.setCompletedRate(multiply.setScale(2,BigDecimal.ROUND_HALF_UP).toPlainString());
@@ -104,7 +106,9 @@ public class StatisticsServiceImpl implements IStatisticsService {
         dto.setCorrectUserCount(correctUserCount);
         // 正确比例
         if(!ObjectUtils.equals(answerMemberCount, 0L)){
-            BigDecimal multiply = BigDecimal.valueOf(correctUserCount).divide(BigDecimal.valueOf(answerMemberCount)).multiply(BigDecimal.valueOf(100));
+            BigDecimal multiply = BigDecimal.valueOf(correctUserCount)
+                    .divide(BigDecimal.valueOf(answerMemberCount),4,BigDecimal.ROUND_HALF_UP)
+                    .multiply(BigDecimal.valueOf(100));
 
             dto.setCorrectRate(multiply.setScale(2, RoundingMode.HALF_UP).toPlainString());
         } else {

fs-service-system/src/main/resources/application-config.yml

@@ -79,8 +79,8 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wx93ce67750e3cfba3 # 第一个公众号的appid  //公众号名称:云联
-        secret: 659fafaace3ca1c4df1bffac173a9bd7
+      - appId: wx961fadab9bcb792b # 第一个公众号的appid  //公众号名称:云联
+        secret: eddde2a1d4ca0c6c443a67e542b6864c
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 jpush: