直播的优惠卷 -改为 发 课程优惠卷

fs-admin/src/main/java/com/fs/company/controller/CompanyWxAccountController.java

@@ -7,7 +7,9 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyWxAccount;
+import com.fs.company.service.ICompanyUserService;
 import com.fs.company.service.ICompanyWxAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,7 +19,7 @@ import java.util.List;
 
 /**
  * 企微账号Controller
- * 
+ *
  * @author fs
  * @date 2024-12-09
  */
@@ -28,6 +30,9 @@ public class CompanyWxAccountController extends BaseController
     @Autowired
     private ICompanyWxAccountService companyWxEnterpriseAccountService;
 
+    @Autowired
+    private ICompanyUserService userService;
+
     /**
      * 查询企微账号列表
      */
@@ -80,6 +85,9 @@ public class CompanyWxAccountController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CompanyWxAccount companyWxAccount)
     {
+        Long companyUserId = companyWxAccount.getCompanyUserId();
+        CompanyUser companyUser = userService.selectCompanyUserById(companyUserId);
+        companyWxAccount.setCompanyId(companyUser.getCompanyId());
         return toAjax(companyWxEnterpriseAccountService.insertCompanyWxAccount(companyWxAccount));
     }
 

fs-live-app/src/main/java/com/fs/live/task/Task.java

@@ -394,6 +394,9 @@ public class Task {
         }
     }
 
+    /**
+    * 执行自动化任务 脚本
+    */
     private void processAutoTask(Set<String> range) {
         for (String liveAutoTask : range) {
             LiveAutoTask task = JSON.parseObject(liveAutoTask, LiveAutoTask.class);

fs-service/src/main/resources/mapper/company/CompanyVoiceRoboticMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.company.mapper.CompanyVoiceRoboticMapper">
-    
+
     <resultMap type="CompanyVoiceRobotic" id="CompanyVoiceRoboticResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCompanyVoiceRoboticList" parameterType="CompanyVoiceRobotic" resultMap="CompanyVoiceRoboticResult">
         <include refid="selectCompanyVoiceRoboticVo"/>
-        <where>  
+        <where>
             del_flag = 0
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
             <if test="taskName != null  and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if>
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
                    order by a.id desc
     </select>
-    
+
     <select id="selectCompanyVoiceRoboticById" parameterType="Long" resultMap="CompanyVoiceRoboticResult">
         <include refid="selectCompanyVoiceRoboticVo"/>
         where id = #{id} and del_flag = 0
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        inner join company_user b on a.company_user_id = b.user_id
     </select>
     <select id="qwUserListCompany" resultType="com.fs.company.vo.CompanyVoiceRoboticQwUserListVo">
-        select a.id, a.wx_nick_name, a.wx_no, u.nick_name as companyUserName
+        select a.id, a.wx_nick_name, a.wx_no, u.nick_name as companyUserName,a.phone
         from company_wx_account a
        inner join company_user u on a.company_user_id = u.user_id
        inner join company_dept d on u.dept_id = d.dept_id
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <update id="deleteCompanyVoiceRoboticByIds" parameterType="String">
-        update company_voice_robotic set del_flag = 1 where id in 
+        update company_voice_robotic set del_flag = 1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -237,4 +237,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                               and del_flag = 0
                                               order by create_time desc
     </select>
-</mapper>
+</mapper>

fs-service/src/main/resources/mapper/his/FsCourseCouponUserMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">#{status},</if>
             <if test="logId != null">#{logId},</if>
             <if test="sendType != null">#{sendType},</if>
-            <if test="liveId != null">#{live_id},</if>
+            <if test="liveId != null">#{liveId},</if>
          </trim>
     </insert>