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

fs-service/src/main/java/com/fs/course/service/impl/FsUserWatchCourseStatisticsServiceImpl.java

@@ -168,10 +168,24 @@ public class FsUserWatchCourseStatisticsServiceImpl extends ServiceImpl<FsUserWa
                     // 获取过滤时间后的销售会员数量
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 
+//                    int userNum = userTotalDataList.stream()
+//                            .filter(v -> v.getUserCreateDate().before(data.getCourseStartDateTime())).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
+//                    int newUserNum = userTotalDataList.stream()
+//                            .filter(v -> sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()))).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
                     int userNum = userTotalDataList.stream()
-                            .filter(v -> v.getUserCreateDate().before(data.getCourseStartDateTime())).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
+                            .filter(v -> {
+                                if (v.getUserCreateDate() == null || data.getCourseStartDateTime() == null || v.getUserNum() == null){
+                                    return false;
+                                }
+                                return v.getUserCreateDate().before(data.getCourseStartDateTime());
+                            }).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
                     int newUserNum = userTotalDataList.stream()
-                            .filter(v -> sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()))).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
+                            .filter(v -> {
+                                if (v.getUserCreateDate() == null || data.getCourseStartDateTime() == null || v.getUserNum() == null){
+                                    return false;
+                                }
+                                return sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()));
+                            }).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
                     vo.setUserNum(userNum);
                     vo.setNewUserNum(newUserNum);
                 } else {

fs-service/src/main/resources/application-config-druid-hdt.yml

@@ -84,7 +84,8 @@ headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 ipad:
   ipadUrl: http://ipad.hebeihdt.com
-  aiApi: http://127.0.0.1:3000/api
+#  aiApi: http://152.136.202.157:3000/api
+  aiApi: http://49.232.181.28:3000/api
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:

fs-service/src/main/resources/application-config-druid-jnmy.yml

@@ -86,7 +86,7 @@ headerImg:
   imgUrl: https
 ipad:
   ipadUrl: http://qwipad.jnmyunl.com
-  aiApi: http://127.0.0.1:3000/api
+  aiApi: http://49.232.181.28:3000/api
 wx_miniapp_temp:
   pay_order_temp_id: -SjnK9K6cNKASa6AD9Q_c0YT7J1lPTEpPIpqbMJF8F0
   inquiry_temp_id: hwFXVh0AWqeasBsZpa0-urb3CrPeYEwBiy3P6AMMGFQ

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

@@ -86,7 +86,8 @@ headerImg:
   imgUrl: https://fs-1346741853.cos.ap-chengdu.myqcloud.com/fs/20250323/6189704f2e134b84ad9c9e7c9999f103.jpg
 ipad:
   ipadUrl: http://qwipad.muyi88.com
-  aiApi: http://152.136.202.157:3000/api
+#  aiApi: http://152.136.202.157:3000/api
+  aiApi: http://49.232.181.28:3000/api
 
 wx_miniapp_temp:
   pay_order_temp_id: VXEvKaGNPFuJmhWK9O_QPrTZxe9umDCukq-maI8Vdek