九州：加个催课时间后面-加一个内容 和是否开启官方群发

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

@@ -1839,6 +1839,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 
             //存看课记录
             courseWatchLogMapper.insertOrUpdateFsCourseWatchLog(watchLog);
+
         }catch (Exception e){
             logger.error("一键群发失败-插入观看记录失败："+e.getMessage());
         }

fs-service/src/main/java/com/fs/huifuPay/service/test.java

@@ -11,14 +11,15 @@ import java.util.Map;
 public class test {
     static HuiFuServiceImpl huiFuService = new HuiFuServiceImpl();
     public static void main(String[] args)throws Exception {
-        onlinePay();
+//        onlinePay();
+        createOrder();
     }
     public static void  createOrder()throws Exception {
         HuiFuCreateOrder order = new HuiFuCreateOrder();
         //    T_MINIAPP: 微信小程序
         //    A_NATIVE: 支付宝正扫
         order.setTradeType("A_NATIVE");
-       order.setOpenid("oeDjB69hXRKeiX7xfeOQv86VWYU0");
+       order.setOpenid("oCtcH7pwOWlPMBJJyQQQz32qq2og");
         order.setReqSeqId("inquiry-117");
         order.setTransAmt("0.01");
         // 商品描述

fs-service/src/main/java/com/fs/sop/domain/QwSopTemp.java

@@ -39,6 +39,7 @@ public class QwSopTemp implements Serializable
     @Excel(name = "状态")
     private String status;
 
+
     /** 排序 */
     @Excel(name = "排序")
     private Integer sort;
@@ -49,7 +50,13 @@ public class QwSopTemp implements Serializable
 
     private Integer gap;
 
+    /**
+    * 是否开启官方群发
+    */
+    private String openOfficial;
+
     private String corpId;
+
     /**
     * 模板类型
     */
@@ -77,4 +84,7 @@ public class QwSopTemp implements Serializable
     @TableField(exist = false)
     private List<String> timeList;
 
+    @TableField(exist = false)
+    private List<String> timeDesc;
+
 }

fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -363,6 +363,7 @@ public class QwSopTempServiceImpl implements IQwSopTempService
         if(temp.getTime() == null){
             return;
         }
+
         FsUserCourse fsUserCourse = fsUserCourseMapper.selectFsUserCourseByCourseId(temp.getCourseId());
         temp.setProject(fsUserCourse.getProject());
         qwSopTempMapper.updateQwSopTemp(temp);
@@ -389,7 +390,12 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                 QwSopTempRules rules = new QwSopTempRules();
                 rules.setTempId(temp.getId());
                 rules.setName(day.getName());
-                rules.setIsOfficial(sorts.get() == 0 ? "1" : "0");
+                if (temp.getOpenOfficial().equals("1")){
+                    rules.setIsOfficial(sorts.get() == 0 ? "1" : "0");
+                }else {
+                    rules.setIsOfficial("0");
+                }
+
                 rules.setTime(time);
                 rules.setContentType(2);
                 rules.setType(2);
@@ -423,6 +429,19 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                     content2.setContent(JSON.toJSONString(setting2));
                     qwSopTempContents.add(content2);
                 }
+                if (sorts.get() > 0){
+
+                    QwSopTempContent content3 = new QwSopTempContent();
+                    content3.setTempId(temp.getId());
+                    content3.setContentType(3);
+                    QwSopTempSetting2.Content.Setting setting3 = new QwSopTempSetting2.Content.Setting();
+                    setting3.setValue(temp.getTimeDesc().get(sorts.get()-1));
+                    setting3.setContentType("1");
+                    content3.setContent(JSON.toJSONString(setting3));
+                    qwSopTempContents.add(content3);
+
+                }
+
                 rules.setSorts(sorts.getAndIncrement());
                 if(rules.getSorts() == 0){
                     rules.setCourseType(0);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -598,7 +598,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                 }).filter(Objects::nonNull).collect(Collectors.toList());
 
 
-            } else {
+            }
+            else {
                 sopLogsList = groupList.stream().map(groupChat -> {
                     QwUser qwUser = qwUserMapper.selectQwUserByIdByWeComeText2(groupChat.getOwner(), groupChat.getCorpId());
                     QwSopLogs sopLogs = new QwSopLogs();
@@ -1136,6 +1137,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
                     break;
                 //小程序单独
                 case "4":
+
                     addWatchLogIfNeeded(param.getSopId(), param.getVideoId(), param.getCourseId(),item.getFsUserId(), String.valueOf(qwUser.getId()), companyUserId, companyId,
                             item.getExternalId(),param.getStartTime(),dataTime );
 

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

@@ -87,6 +87,7 @@ headerImg:
   imgUrl: https://jiuzhouzaixian.obs.cn-southwest-2.myhuaweicloud.com/fs/20250623/1750665141214.png
 ipad:
   ipadUrl: http://ipad.jiuzhouzaixian.com
+  aiApi:
 wx_miniapp_temp:
   pay_order_temp_id: VXEvKaGNPFuJmhWK9O_QPrTZxe9umDCukq-maI8Vdek
   inquiry_temp_id: 9POPYeqhI48LOPvq-Rfoklze7H-9SlunJKh10Qt4_2I

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -285,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim suffixOverrides=",">
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
+
     </insert>