Merge branch 'refs/heads/master' into 企微聊天

# Conflicts:
#	fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java
#	fs-service/src/main/java/com/fs/course/service/IFsCourseWatchLogService.java

fs-admin/src/main/java/com/fs/course/controller/FsUserCourseCategoryController.java

@@ -163,7 +163,8 @@ public class FsUserCourseCategoryController extends BaseController
             List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(userId);
             return R.ok().put("data", list);
         }
-        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList();
+        Integer isShow = null;
+        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(isShow);
         return R.ok().put("data", list);
     }
 

fs-admin/src/main/java/com/fs/course/controller/FsUserCoursePeriodController.java

@@ -161,14 +161,17 @@ public class FsUserCoursePeriodController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('course:period:updateCourseTime')")
     @PostMapping("/updateCourseTime")
+    @Log(title = "会员营期修改课程时间", businessType = BusinessType.UPDATE)
     public R updateCourseTime(@RequestBody UpdateCourseTimeVo vo){
         return fsUserCoursePeriodDaysService.updateCourseTime(vo);
     }
     @PostMapping("/updateCourseDate")
+    @Log(title = "会员营期修改CourseDate", businessType = BusinessType.UPDATE)
     public R updateCourseDate(@RequestBody UpdateCourseTimeVo vo){
         return fsUserCoursePeriodDaysService.updateCourseDate(vo);
     }
     @PostMapping("/updateListCourseData")
+    @Log(title = "会员营期修改ListCourseData", businessType = BusinessType.UPDATE)
     public R updateListCourseData(@RequestBody List<FsUserCoursePeriodDays> entity){
         return fsUserCoursePeriodDaysService.updateListCourseData(entity);
     }
@@ -275,6 +278,7 @@ public class FsUserCoursePeriodController extends BaseController {
 
     @PreAuthorize("@ss.hasPermi('course:period:setCompanyRedPacket')")
     @ApiOperation("按公司批量保存设置红包金额")
+    @Log(title = "按公司批量保存设置红包金额", businessType = BusinessType.UPDATE)
     @PostMapping("/batchRedPacket/byCompany")
     public R batchRedPacketByCompany(@Validated @RequestBody BatchCompanyRedPackageParam param) {
         try {

fs-admin/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -252,6 +252,30 @@ public class FsCompanyController extends BaseController {
 
     }
 
+    @PreAuthorize("@ss.hasPermi('his:company:redDeduct')")
+    @Log(title = "企业扣款", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/redDeduct")
+    @Transactional
+    @RepeatSubmit
+    public R redDeduct(@RequestBody CompanyDeductParam param)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        CompanyDeduct deduct=new CompanyDeduct();
+        String orderSn =  OrderCodeUtils.getOrderSn();
+        if(StringUtils.isEmpty(orderSn)){
+            return R.error("订单生成失败，请重试");
+        }
+        deduct.setDeductNo(orderSn);
+        deduct.setCompanyId(param.getCompanyId());
+        deduct.setMoney(param.getMoney());
+        deduct.setCreateUserId(loginUser.getUser().getUserId());
+        deduct.setIsAudit(0);
+        deduct.setRemark(param.getRemark());
+        deduct.setBusinessType(1); // 红包扣款
+        deductService.insertCompanyDeduct(deduct);
+        return R.ok("提交成功,等待审核");
+    }
+
     @PreAuthorize("@ss.hasPermi('his:company:deduct')")
     @Log(title = "企业扣款", businessType = BusinessType.INSERT)
     @PostMapping(value = "/deduct")

fs-admin/src/main/java/com/fs/his/controller/FsCompanyDeductController.java

@@ -139,19 +139,24 @@ public class FsCompanyDeductController extends BaseController
         deduct.setRemark(param.getRemark());
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if(deduct.getIsAudit()==1){
-            Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
-            company.setMoney(company.getMoney().subtract(deduct.getMoney()));
-            deduct.setBalance(company.getMoney());
-            companyService.updateCompany(company);
-            //生成流水
-            CompanyMoneyLogs log=new CompanyMoneyLogs();
-            log.setCompanyId(deduct.getCompanyId());
-            log.setMoney(deduct.getMoney().multiply(new BigDecimal(-1)));
-            log.setRemark(deduct.getRemark());
-            log.setLogsType(2);
-            log.setBalance(company.getMoney());
-            log.setCreateTime(new Date());
-            moneyLogsService.insertCompanyMoneyLogs(log);
+            if(1==param.getBusinessType()){// 红包充值
+                // 更新红包充值余额redis字段
+                companyService.redPacketTopUpCompany(deduct.getCompanyId(),deduct.getMoney(),"2");
+            }else {
+                Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
+                company.setMoney(company.getMoney().subtract(deduct.getMoney()));
+                deduct.setBalance(company.getMoney());
+                companyService.updateCompany(company);
+                //生成流水
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(deduct.getCompanyId());
+                log.setMoney(deduct.getMoney().multiply(new BigDecimal(-1)));
+                log.setRemark(deduct.getRemark());
+                log.setLogsType(2);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                moneyLogsService.insertCompanyMoneyLogs(log);
+            }
         }
         deduct.setAuditTime(new Date());
         deduct.setAuditUserId(loginUser.getUser().getUserId());

fs-admin/src/main/java/com/fs/his/controller/FsCompanyRechargeController.java

@@ -139,7 +139,7 @@ public class FsCompanyRechargeController extends BaseController
         if(companyRecharge.getIsAudit()==1){
             if(1==companyRecharge.getBusinessType()){// 红包充值
                 // 更新红包充值余额redis字段
-                companyService.redPacketTopUpCompany(companyRecharge.getCompanyId(),companyRecharge.getMoney());
+                companyService.redPacketTopUpCompany(companyRecharge.getCompanyId(),companyRecharge.getMoney(),"1");
             }else {
                 Company company=companyService.selectCompanyByIdForUpdate(companyRecharge.getCompanyId());
                 company.setMoney(company.getMoney().add(companyRecharge.getMoney()));

fs-admin/src/main/java/com/fs/his/task/CompanyBalanceTask.java

@@ -1,11 +1,14 @@
 package com.fs.his.task;
 
 import com.fs.company.service.ICompanyService;
+import com.fs.company.vo.RedPacketMoneyVO;
 import com.fs.course.service.BalanceRollbackErrorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @description: 公司余额同步定时任务 (红包余额)
  * @author: Xgb
@@ -58,6 +61,18 @@ public class CompanyBalanceTask {
 
     }
 
+    /**
+     * @Description: 红包余额回滚（回滚的是客户没领取的红包），红包记录表中，两天没领取的记录不会再发送
+     * @Param: 每天0点执行一次
+     * @Return:
+     * @Author xgb
+     * @Date 2025/11/7 9:48
+     */
+    public void rollbackRedPacketMoney() throws Exception {
+        // 这个地方真加的是company money字段 xgb 红包余额独立后这个方法弃用
+        companyService.rollbackRedPacketMoney();
+    }
+
     /**
      * @Description: 每天晚上0点定时获取获取公司余额，记录到数据库中
      * @Param:

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -603,6 +603,7 @@ public class Task {
 
 
     public void redPacketAddMoney() throws Exception {
+        // 这个地方真加的是company money字段 xgb 红包余额独立后这个方法弃用
         List<RedPacketMoneyVO> redPacketMoneyVOS = fsCourseRedPacketLogMapper.selectFsCourseAddRedPacketLogByCompany();
         for (RedPacketMoneyVO redPacketMoneyVO : redPacketMoneyVOS) {
             companyService.addRedPacketCompanyMoney(redPacketMoneyVO.getMoney(), redPacketMoneyVO.getCompanyId());

fs-admin/src/test/java/com/fs/api/controller/IndexStatisticsControllerTest.java

@@ -1,37 +0,0 @@
-package com.fs.api.controller;
-
-import com.fs.FSApplication;
-import com.fs.common.core.domain.R;
-import com.fs.statis.dto.AnalysisPreviewQueryDTO;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = FSApplication.class)
-@RequiredArgsConstructor
-@Slf4j
-public class IndexStatisticsControllerTest {
-
-    @Autowired
-    private IndexStatisticsController indexStatisticsController;
-
-    @Test
-    public void analysisPreview() {
-        AnalysisPreviewQueryDTO dto = new AnalysisPreviewQueryDTO();
-        dto.setCompanyId(null);
-        dto.setDeptId(1L);
-        dto.setEndTime("2025-10-31 23:59:59");
-        dto.setStartTime("2025-10-01 00:00:00");
-        dto.setType(4);
-        dto.setUserType(1);
-        R r = indexStatisticsController.analysisPreview(dto);
-        log.info("r: {}",r);
-    }
-}

fs-company/src/main/java/com/fs/company/controller/company/CompanyUserController.java

@@ -21,6 +21,7 @@ import com.fs.company.param.CompanyUserAreaParam;
 import com.fs.company.param.CompanyUserCodeParam;
 import com.fs.company.param.CompanyUserQwParam;
 import com.fs.company.service.*;
+import com.fs.company.service.impl.CompanyDeptServiceImpl;
 import com.fs.company.utils.DomainUtil;
 import com.fs.company.utils.QwStatusEnum;
 import com.fs.company.vo.BatchUserRolesVO;
@@ -100,6 +101,10 @@ public class CompanyUserController extends BaseController {
     @Autowired
     IQwCompanyService iQwCompanyService;
 
+    @Autowired
+    private CompanyDeptServiceImpl companyDeptService;
+
+
     @Autowired
     private IQwUserService qwUserService;
 
@@ -475,6 +480,38 @@ public class CompanyUserController extends BaseController {
         return  R.ok().put("data",list);
     }
 
+    @GetMapping("/getQwMyUserList/{id}")
+    public R getQwMyUserList(@PathVariable("id") String corpId)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        List<QwUserVO> list = companyUserService.selectCompanyQwUserListByMy(corpId,loginUser.getCompany().getCompanyId(),loginUser.getUser().getUserId());
+        return  R.ok().put("data",list);
+    }
+
+    @GetMapping("/getQwDeptUserList/{id}")
+    public R getQwDeptUserList(@PathVariable("id") String corpId)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+
+        List<Long> combinedList = new ArrayList<>();
+        //本部门
+        Long deptId = loginUser.getUser().getDeptId();
+        if (deptId!=null){
+            combinedList.add(deptId);
+        }
+        //本部门的下级部门
+        List<Long> deptList = companyDeptService.selectCompanyDeptByParentId(deptId);
+        if (!deptList.isEmpty()){
+            combinedList.addAll(deptList);
+        }
+        String userType = loginUser.getUser().getUserType();
+
+        List<QwUserVO> list = companyUserService.selectCompanyQwUserListByDept(corpId,loginUser.getCompany().getCompanyId(),combinedList,userType);
+        return  R.ok().put("data",list);
+    }
+
+
+
     /**
      * 根据部门的id获取到企业微信的qwuserid
      */

fs-company/src/main/java/com/fs/company/controller/course/qw/FsQwCourseWatchLogController.java

@@ -225,8 +225,13 @@ public class FsQwCourseWatchLogController extends BaseController
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId( loginUser.getCompany().getCompanyId());
+        List<QwWatchLogStatisticsListVO> list = new ArrayList<>();
 
-        List<QwWatchLogStatisticsListVO> list = qwWatchLogService.selectQwWatchLogStatisticsListVOExport(param);
+        if ("济南联志健康".equals(signProjectName)) {
+            list = qwWatchLogService.selectQwWatchLogStatisticsListVOExportExcludeTransfer(param);
+        }else{
+            list = qwWatchLogService.selectQwWatchLogStatisticsListVOExport(param);
+        }
 
         ExcelUtil<QwWatchLogStatisticsListVO> util = new ExcelUtil<QwWatchLogStatisticsListVO>(QwWatchLogStatisticsListVO.class);
         return util.exportExcel(list, "短链课程看课记录数据");

fs-company/src/main/java/com/fs/company/controller/qw/QwExternalContactController.java

@@ -13,9 +13,10 @@ import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.impl.CompanyDeptServiceImpl;
+import com.fs.course.param.FsCourseWatchLogListParam;
 import com.fs.course.param.FsUserCourseListUParam;
-import com.fs.course.service.IFsUserCompanyBindService;
-import com.fs.course.service.IFsUserCourseStudyService;
+import com.fs.course.service.*;
+import com.fs.course.vo.FsCourseWatchLogListVO;
 import com.fs.course.vo.FsUserCourseStudyListUVO;
 import com.fs.course.vo.UserWatchLogListVo;
 import com.fs.crm.param.CrmMyCustomerListQueryParam;
@@ -718,7 +719,78 @@ public class QwExternalContactController extends BaseController
         return R.ok("正在批量修改备注中");
     }
 
+    /**
+     * copy批量修改备注方法，该方法提供给我的看课记录里面使用
+     * @param param
+     * @return
+     * @throws JSONException
+     */
+    @PreAuthorize("@ss.hasPermi('qw:externalContact:edit')")
+    @Log(title = "批量修改备注", businessType = BusinessType.UPDATE)
+    @PostMapping("/batchUpdateExternalContactNotesByWatchLog")
+    public R batchUpdateExternalContactNotesByWatchLog(@RequestBody QwExternalContactUpdateNoteParam param) throws JSONException {
+        if(param.isFilter()){
+            param.setWatchLogIds(getWatchLogIds(param.getFromMyList(), param.getWatchLogParam()));
+        }
+        //查询
+        if(null != param.getWatchLogIds() && !param.getWatchLogIds().isEmpty()){
+            param.setUserIds(getUserIdsByWatchLogIds(param.getWatchLogIds()));
+        }
+
+        if(param.getUserIds() == null || param.getUserIds().isEmpty()){
+            return R.error("修改用户为空");
+        }
+        qwUserServiceAsyncHelper.batchUpdateExternalContactNotes(param);
+        return R.ok("正在批量修改备注中");
+    }
+
+    @Autowired
+    private IFsUserCoursePeriodService userCoursePeriodService;
 
+    @Autowired
+    private IFsUserCoursePeriodDaysService userCoursePeriodDaysService;
+
+    @Autowired
+    private IFsCourseWatchLogService fsCourseWatchLogService;
+    /**
+     * 用于适配看课批量修改标签【根据过滤条件版】
+     * @param fromMyList
+     * @param watchLogParam
+     * @return
+     */
+    private List<Long> getWatchLogIds(Integer fromMyList,FsCourseWatchLogListParam watchLogParam){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if(Integer.valueOf(0).equals(fromMyList)){
+            watchLogParam.setCompanyId( loginUser.getCompany().getCompanyId());
+        }else{
+            watchLogParam.setCompanyUserId( loginUser.getUser().getUserId());
+        }
+
+        if (watchLogParam.getSendType()==1&& watchLogParam.getPeriodETime()!=null && watchLogParam.getPeriodSTime()!=null) {
+            List<Long> periodIds = userCoursePeriodDaysService.selectFsUserCoursePeriodDaysByTime(watchLogParam.getPeriodSTime(), watchLogParam.getPeriodETime());
+
+            if (!periodIds.isEmpty()){
+                List<Long> longs = userCoursePeriodService.selectFsUserCoursePeriodListByPeriodId(periodIds, loginUser.getCompany().getCompanyId());
+                if (!longs.isEmpty()){
+                    watchLogParam.setPeriodIds(longs);
+                }else {
+                    return new ArrayList<>();
+                }
+            }else {
+                return new ArrayList<>();
+            }
+
+        }
+
+        List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(watchLogParam);
+        List<Long> collect = list.stream().map(FsCourseWatchLogListVO::getLogId).collect(Collectors.toList());
+        return collect;
+    }
+    private List<Long> getUserIdsByWatchLogIds(List<Long> watchLogIds){
+        List<Long> exContactIdsIdsByWatchLogIds = fsCourseWatchLogService.getExContactIdsIdsByWatchLogIds(watchLogIds);
+        Set<Long> set = new HashSet<>(exContactIdsIdsByWatchLogIds);
+        return new ArrayList<>(set);
+    }
 
     private List<Long> getList(Integer addType, QwExternalContactParam param){
         if(addType == null){

fs-company/src/main/java/com/fs/company/controller/qw/QwTagController.java

@@ -5,7 +5,9 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.qw.domain.QwTag;
 import com.fs.qw.param.QwTagParam;
@@ -45,6 +47,8 @@ public class QwTagController extends BaseController
     @PostMapping("/searchTags")
     public TableDataInfo  searchTags(@RequestBody QwTagParam tagParam)
     {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        tagParam.setCompanyId(loginUser.getCompany().getCompanyId());
         return getDataTable(qwTagService.searchTags(tagParam));
     }
     /**

fs-service/src/main/java/com/fs/company/domain/CompanyDeduct.java

@@ -10,7 +10,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 扣款对象 company_deduct
- * 
+ *
  * @author fs
  * @date 2023-02-27
  */
@@ -57,6 +57,17 @@ public class CompanyDeduct extends BaseEntity
     @Excel(name = "备注")
     private String remark;
 
+    @Excel(name = "业务类型")
+    private Integer businessType;
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
     @Override
     public String getRemark() {
         return remark;
@@ -72,79 +83,79 @@ public class CompanyDeduct extends BaseEntity
         this.deductId = deductId;
     }
 
-    public Long getDeductId() 
+    public Long getDeductId()
     {
         return deductId;
     }
-    public void setDeductNo(String deductNo) 
+    public void setDeductNo(String deductNo)
     {
         this.deductNo = deductNo;
     }
 
-    public String getDeductNo() 
+    public String getDeductNo()
     {
         return deductNo;
     }
-    public void setCompanyId(Long companyId) 
+    public void setCompanyId(Long companyId)
     {
         this.companyId = companyId;
     }
 
-    public Long getCompanyId() 
+    public Long getCompanyId()
     {
         return companyId;
     }
-    public void setMoney(BigDecimal money) 
+    public void setMoney(BigDecimal money)
     {
         this.money = money;
     }
 
-    public BigDecimal getMoney() 
+    public BigDecimal getMoney()
     {
         return money;
     }
-    public void setBalance(BigDecimal balance) 
+    public void setBalance(BigDecimal balance)
     {
         this.balance = balance;
     }
 
-    public BigDecimal getBalance() 
+    public BigDecimal getBalance()
     {
         return balance;
     }
-    public void setCreateUserId(Long createUserId) 
+    public void setCreateUserId(Long createUserId)
     {
         this.createUserId = createUserId;
     }
 
-    public Long getCreateUserId() 
+    public Long getCreateUserId()
     {
         return createUserId;
     }
-    public void setIsAudit(Integer isAudit) 
+    public void setIsAudit(Integer isAudit)
     {
         this.isAudit = isAudit;
     }
 
-    public Integer getIsAudit() 
+    public Integer getIsAudit()
     {
         return isAudit;
     }
-    public void setAuditUserId(Long auditUserId) 
+    public void setAuditUserId(Long auditUserId)
     {
         this.auditUserId = auditUserId;
     }
 
-    public Long getAuditUserId() 
+    public Long getAuditUserId()
     {
         return auditUserId;
     }
-    public void setAuditTime(Date auditTime) 
+    public void setAuditTime(Date auditTime)
     {
         this.auditTime = auditTime;
     }
 
-    public Date getAuditTime() 
+    public Date getAuditTime()
     {
         return auditTime;
     }
@@ -162,6 +173,8 @@ public class CompanyDeduct extends BaseEntity
             .append("isAudit", getIsAudit())
             .append("auditUserId", getAuditUserId())
             .append("auditTime", getAuditTime())
+                .append("remark", getRemark())
+                .append("businessType", getBusinessType())
             .toString();
     }
 }

fs-service/src/main/java/com/fs/company/mapper/CompanyDeductMapper.java

@@ -108,6 +108,9 @@ public interface CompanyDeductMapper
             "<if test = 'maps.createTime != null  '> " +
             "and   DATE(d.create_time) = DATE(#{maps.createTime})" +
             "</if>" +
+            "<if test = 'maps.businessType != null  '> " +
+            "and   d.business_type = #{maps.businessType}" +
+            "</if>" +
             "<if test = 'maps.companyName != null  '> " +
             "and c.company_name like concat('%', #{maps.companyName }, '%')" +
             "</if>" +

fs-service/src/main/java/com/fs/company/mapper/CompanyUserMapper.java

@@ -151,6 +151,25 @@ public interface CompanyUserMapper
     @Select("select * from  qw_user  where corp_id=#{corpId} and company_id=#{companyId}")
     List<QwUserVO> selectCompanyQwUserList(@Param("corpId") String corpId,@Param("companyId")Long companyId);
 
+    @Select("select * from  qw_user  where corp_id=#{corpId} and company_id=#{companyId} and company_user_id=#{userId}")
+    List<QwUserVO> selectCompanyQwUserListByMy(@Param("corpId") String corpId,@Param("companyId")Long companyId,@Param("userId")Long userId);
+
+    @Select("<script>" +
+            "select qu.* from qw_user qu " +
+            "left join company_user cu on cu.user_id = qu.company_user_id " +
+            "where 1=1 " +
+            "and qu.corp_id = #{corpId} " +
+            "and qu.company_id = #{companyId} " +
+            "<if test=\"combinedList != null and !combinedList.isEmpty() and  userType != '00' \">" +
+            "and cu.dept_id IN " +
+            "<foreach collection='combinedList' item='deptId' open='(' separator=',' close=')'>" +
+            "#{deptId}" +
+            "</foreach>" +
+            "</if>" +
+            "</script>")
+    List<QwUserVO> selectCompanyQwUserListByDept(@Param("corpId") String corpId,@Param("companyId")Long companyId,
+                                                 @Param("combinedList") List<Long> combinedList,@Param("userType")String userType);
+
 
     List<CompanyUserQwListVO> selectCompanyUserQwListVO(CompanyUserQwParam user);
 

fs-service/src/main/java/com/fs/company/service/ICompanyService.java

@@ -170,7 +170,7 @@ public interface ICompanyService
 
     void syncCompanyBalance();
 
-    void redPacketTopUpCompany(Long companyId, BigDecimal money);
+    void redPacketTopUpCompany(Long companyId, BigDecimal money,String type);
 
     void asyncRecordBalanceLog(Long companyId, BigDecimal money,Integer logType, BigDecimal balance, String remark);
 
@@ -181,4 +181,6 @@ public interface ICompanyService
      * @param list 公司列表
      */
     void batchUpdateCompany(List<Company> list);
+
+    void rollbackRedPacketMoney();
 }

fs-service/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -129,6 +129,8 @@ public interface ICompanyUserService {
     List<CitysAreaVO> getCitysAreaList();
 
     List<QwUserVO> selectCompanyQwUserList(String corpId,Long companyId);
+    List<QwUserVO> selectCompanyQwUserListByMy(String corpId,Long companyId,Long userId);
+    List<QwUserVO> selectCompanyQwUserListByDept(String corpId,Long companyId,List<Long> combinedList,String userType);
 
     List<CompanyUserQwListVO> selectCompanyUserQwListVO(CompanyUserQwParam user);
 

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -21,10 +21,8 @@ import com.fs.company.param.CompanyParam;
 import com.fs.company.service.ICompanyMiniappService;
 import com.fs.company.service.ICompanyProfitService;
 import com.fs.company.service.ICompanyRoleService;
-import com.fs.company.vo.CompanyCrmVO;
-import com.fs.company.vo.CompanyNameVO;
-import com.fs.company.vo.CompanyVO;
-import com.fs.company.vo.DeptDataVO;
+import com.fs.company.vo.*;
+import com.fs.course.mapper.FsCourseRedPacketLogMapper;
 import com.fs.his.config.StoreConfig;
 import com.fs.his.domain.FsInquiryOrder;
 import com.fs.his.domain.FsStoreOrder;
@@ -110,6 +108,9 @@ public class CompanyServiceImpl implements ICompanyService
     @Autowired
     private RedissonClient redissonClient;
 
+    @Autowired
+    private FsCourseRedPacketLogMapper fsCourseRedPacketLogMapper;
+
     @Autowired
     private TransactionTemplate transactionTemplate;
 
@@ -1393,13 +1394,13 @@ public class CompanyServiceImpl implements ICompanyService
 
     /**
      * @Description: 红包充值
-     * @Param:
+     * @Param: type 充值类型 1 充值 2 扣款
      * @Return:
      * @Author xgb
      * @Date 2025/11/3 14:01
      */
     @Override
-    public void redPacketTopUpCompany(Long companyId, BigDecimal money) {
+    public void redPacketTopUpCompany(Long companyId, BigDecimal money,String type) {
 
         String companyMoneyKey = FsConstants.COMPANY_MONEY_KEY + companyId;
 
@@ -1416,23 +1417,31 @@ public class CompanyServiceImpl implements ICompanyService
                     originalMoney = new BigDecimal(moneyStr);
                 }else {
                     // 缓存没有值,重启系统恢复redis数据 保证数据正确性
-                    logger.error("红包余额充值获取redis余额缓存异常，异常请求参数companyId：{}，money：{}",companyId,money);
+                    logger.error("红包余额充值获取redis余额缓存异常，异常请求参数companyId：{}，money：{},type:{}",companyId,money, type);
                     throw new RuntimeException("红包余额充值获取redis余额缓存异常");
                 }
 
+                if(type.equals("1")){// 充值
+
+                }else if(type.equals("2")) {// 扣减
+                    money=money.multiply(new BigDecimal(-1));
+                }else {
+                    logger.error("红包余额充值参数异常，异常请求参数companyId：{}，money：{},type:{}",companyId,money, type);
+                    throw new RuntimeException("红包余额充值参数异常");
+                }
                 // 增加余额
                 BigDecimal newMoney = originalMoney.add(money);
                 redisCache.setCacheObject(companyMoneyKey, newMoney.toString());
 
                 // 异步登记余额添加日志
-                asyncRecordBalanceLog(companyId,money,16,newMoney,"红包充值");
+                asyncRecordBalanceLog(companyId,money,16,newMoney,"红包充值(负数为扣款)");
 
             } else {
-                logger.error("获取redis锁失败，异常请求参数companyId：{}，money：{}",companyId,money);
+                logger.error("获取redis锁失败，异常请求参数companyId：{}，money：{},type:{}",companyId,money, type);
                 throw new RuntimeException("服务繁忙,请稍后重试");
             }
         } catch (Exception e) {
-            logger.error("增加余额失败: 异常请求参数companyId：{}，money：{}",companyId,money, e);
+            logger.error("增加余额失败: 异常请求参数companyId：{}，money：{},type:{}",companyId,money, type, e);
             throw new RuntimeException("系统异常,请稍后重试");
         }finally {
             // 只有在成功获取锁的情况下才释放锁
@@ -1440,7 +1449,7 @@ public class CompanyServiceImpl implements ICompanyService
                 try {
                     lock1.unlock();
                 } catch (IllegalMonitorStateException e) {
-                    logger.error("尝试释放非当前线程持有的锁: 异常请求参数companyId：{}，money：{}",companyId,money);
+                    logger.error("尝试释放非当前线程持有的锁: 异常请求参数companyId：{}，money：{},type:{}",companyId,money, type);
                 }
             }
         }
@@ -1517,4 +1526,59 @@ public class CompanyServiceImpl implements ICompanyService
         companyMapper.batchUpdateCompany(list);
     }
 
+    /**
+     * @Description: 红包余额回滚（回滚的是客户没领取的红包），红包记录表中，两天没领取的记录不会再发送
+     * @Param:
+     * @Return:
+     * @Author xgb
+     * @Date 2025/11/7 9:53
+     */
+    @Override
+    public void rollbackRedPacketMoney() {
+        List<RedPacketMoneyVO> redPacketMoneyVOS = fsCourseRedPacketLogMapper.selectFsCourseAddRedPacketLogByCompany();
+        for(RedPacketMoneyVO company:redPacketMoneyVOS){
+            logger.info("红包余额回滚开始：{}",company);
+        }
+        Optional.ofNullable(redPacketMoneyVOS).ifPresent(list -> list.forEach(company -> {
+
+            if(company.getCompanyId()==null){
+                logger.error("红包记录表中存在公司id为null的异常数据");
+                return;
+            }
+            String companyMoneyKey = FsConstants.COMPANY_MONEY_KEY + company.getCompanyId();
+            // 加锁，与看课发放红包的加锁保持一致
+            RLock lock = redissonClient.getLock(FsConstants.COMPANY_MONEY_LOCK + company.getCompanyId());
+            boolean lockAcquired = false;
+            try {
+                lockAcquired = lock.tryLock(3, 10, TimeUnit.SECONDS);
+                if (lockAcquired) {
+                    BigDecimal redisMoney;
+                    // 获取当前余额
+                    String moneyStr = redisCache.getCacheObject(companyMoneyKey);
+                    if (StringUtils.isNotEmpty(moneyStr)) {
+                        redisMoney = new BigDecimal(moneyStr);
+                    }else {
+                        logger.error("缓存公司id:{}的余额不存在,回滚金额{}",company.getCompanyId(),company.getMoney());
+                        return;
+                    }
+                    BigDecimal newMoney = redisMoney.add(company.getMoney());
+                    redisCache.setCacheObject(companyMoneyKey, newMoney.toString());
+
+                    String remark = "执行时间:"+DateUtils.getTime()+"，T2天客户未领取红包退回，金额: " + company.getMoney();
+                    asyncRecordBalanceLog(company.getCompanyId(),company.getMoney(),16,newMoney,remark);
+                }
+            } catch (Exception e) {
+                logger.error("退回的红包同步增加到缓存和数据表，参数错误，请求异常，异常信息：{}", e.getMessage(), e);
+            } finally {
+                if (lockAcquired && lock.isHeldByCurrentThread()) {
+                    try {
+                        lock.unlock();
+                    } catch (IllegalMonitorStateException e) {
+                        logger.warn("尝试释放非当前线程持有的锁: companyId：{}", company.getCompanyId());
+                    }
+                }
+            }
+        }));
+    }
+
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -663,6 +663,17 @@ public class CompanyUserServiceImpl implements ICompanyUserService
     public List<QwUserVO> selectCompanyQwUserList(String corpId,Long companyId) {
         return companyUserMapper.selectCompanyQwUserList(corpId,companyId);
     }
+
+    @Override
+    public List<QwUserVO> selectCompanyQwUserListByMy(String corpId, Long companyId, Long userId) {
+        return companyUserMapper.selectCompanyQwUserListByMy(corpId,companyId,userId);
+    }
+
+    @Override
+    public List<QwUserVO> selectCompanyQwUserListByDept(String corpId, Long companyId, List<Long> combinedList, String userType) {
+        return companyUserMapper.selectCompanyQwUserListByDept(corpId,companyId,combinedList,userType);
+    }
+
     @Override
     @DataScope(deptAlias = "u", userAlias = "u")
     public List<CompanyUserQwListVO> selectCompanyUserQwListVO(CompanyUserQwParam user) {

fs-service/src/main/java/com/fs/company/vo/CompanyDeductVO.java

@@ -55,6 +55,9 @@ public class CompanyDeductVO implements Serializable {
     @Excel(name = "审核人")
     private String auditUserNickName;
 
+    @Excel(name = "业务类型(0-普通，1-红包扣款)")
+    private Integer businessType;
+
 }
 
 

fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -575,4 +575,13 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
      * 查询用户看课记录
      */
     List<FsCourseWatchLogIMVO> selectWatchLogIMVOListByMap(@Param("params") Map<String, Object> params);
+
+    @Select({"<script>" +
+            " select qw_external_contact_id from fs_course_watch_log where log_id in  " +
+            "        <foreach collection=\"watchLogIds\" item=\"id\" open=\"(\" separator=\",\" close=\")\">\n" +
+               "    #{id} " +
+               "</foreach>" +
+            "</script>"
+    })
+    List<Long> getExContactIdsIdsByWatchLogIds(@Param("watchLogIds")List<Long> watchLogIds);
 }

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseCategoryMapper.java

@@ -68,8 +68,8 @@ public interface FsUserCourseCategoryMapper
     @Select("select cate_id dict_value, cate_name dict_label,is_del status from fs_store_product_category WHERE pid = 0 and is_del=0 ")
     List<OptionsVO> selectFsUserCoursePidList();
 
-    @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 ")
-    List<OptionsVO> selectFsUserCourseCategoryPidList();
+//    @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 ")
+    List<OptionsVO> selectFsUserCourseCategoryPidList(@Param("isShow") Integer isShow);
 
     @Select("select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0 and user_id = #{userId}")
     List<OptionsVO> selectFsUserCourseCategoryPidListByUserId(Long userId);

fs-service/src/main/java/com/fs/course/mapper/FsVideoResourceMapper.java

@@ -22,6 +22,11 @@ public interface FsVideoResourceMapper extends BaseMapper<FsVideoResource> {
     @Select("select * from fs_video_resource where line1 is not null and is_transcode = 0 and is_del = 0")
     List<FsVideoResource> selectVideoNotTranscode();
 
+
+    @Select("select * from fs_video_resource where file_key = 'course/20251020/1760932918788.mp4'")
+    List<FsVideoResource> selectVideoNotTranscodeTest();
+
+
     @Select("select * from fs_video_resource where is_transcode = 1 and is_del = 0 and transcode_file_key is null")
     List<FsVideoResource> selectVideoIsTranscode();
 

fs-service/src/main/java/com/fs/course/service/IFsCourseWatchLogService.java

@@ -146,4 +146,11 @@ public interface IFsCourseWatchLogService extends IService<FsCourseWatchLog> {
      * 查询用户看课记录
      */
     List<FsCourseWatchLogIMVO> selectWatchLogIMVOListByMap(Map<String, Object> params);
+
+    /**
+     * 根据看课记录id获取所有的外部联系人ids
+     * @param watchLogIds
+     * @return
+     */
+    List<Long> getExContactIdsIdsByWatchLogIds(List<Long> watchLogIds);
 }

fs-service/src/main/java/com/fs/course/service/IFsUserCourseCategoryService.java

@@ -63,7 +63,7 @@ public interface IFsUserCourseCategoryService
 
     List<OptionsVO> selectFsUserCoursePidList();
 
-    List<OptionsVO> selectFsUserCourseCategoryPidList();
+    List<OptionsVO> selectFsUserCourseCategoryPidList(Integer isShow);
     List<OptionsVO> selectFsUserCourseCategoryPidList(Long userId);
 
     List<OptionsVO> selectCateListByPid(Long pid);

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

@@ -1289,6 +1289,17 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
         return fsCourseWatchLogMapper.selectQwFsCourseWatchLogStatisticsListVO(param);
     }
 
+    /**
+     * 根据看课记录id获取所有的外部联系人ids
+     * @param watchLogIds
+     * @return
+     */
+    @Override
+    public List<Long> getExContactIdsIdsByWatchLogIds(List<Long> watchLogIds){
+        return fsCourseWatchLogMapper.getExContactIdsIdsByWatchLogIds(watchLogIds);
+    }
+
+
 
     /**
      * 查询用户看课记录

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

@@ -101,8 +101,8 @@ public class FsUserCourseCategoryServiceImpl implements IFsUserCourseCategorySer
     }
 
     @Override
-    public List<OptionsVO> selectFsUserCourseCategoryPidList() {
-        return fsUserCourseCategoryMapper.selectFsUserCourseCategoryPidList();
+    public List<OptionsVO> selectFsUserCourseCategoryPidList(Integer isShow) {
+        return fsUserCourseCategoryMapper.selectFsUserCourseCategoryPidList(isShow);
     }
 
     @Override

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -1522,7 +1522,7 @@ public class AiHookServiceImpl implements AiHookService {
                             }
                             if (value != null) {
                                 str += fieldName + ": " + value.toString() + "\n";
-                            }else {
+                            }else if("交流状态".equals(fieldName) || "学习到的章节".equals(fieldName)){
                                 str += fieldName + ":  \n";
                             }
                         }

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -243,6 +243,11 @@ public class FsUserServiceImpl implements IFsUserService {
         } else {
             fsUser.setPhone(null);
         }
+        if (ObjectUtils.isNotEmpty(fsUser.getLevel())&&fsUser.getLevel().equals(1)){
+            fsUser.setIsShow(1);
+        }else {
+            fsUser.setIsShow(0);
+        }
         return fsUserMapper.updateFsUser(fsUser);
     }
 

fs-service/src/main/java/com/fs/hisStore/enums/CompanyEnum.java

@@ -0,0 +1,47 @@
+package com.fs.hisStore.enums;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 设置单店铺的商城
+ */
+public enum CompanyEnum {
+    YISHANYUAN("益善缘"),
+    KANGNIAN_TANG("康年堂"),
+    SIFU_TANG("四福堂"),
+    NMG_MYT("内蒙古一贴"),
+    CQ_TYT("重庆泰医堂"),
+    CHUNZHENG_TANG("纯正堂");
+
+    private final String companyName;
+
+    CompanyEnum(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    /**
+     * 静态集合，避免每次调用都重新创建
+     */
+    private static final Set<String> COMPANY_NAMES = Collections.unmodifiableSet(
+            Arrays.stream(values())
+                    .map(CompanyEnum::getCompanyName)
+                    .collect(Collectors.toSet())
+    );
+
+    /**
+     * 比较是否存在
+     *
+     * @param companyName
+     * @return
+     */
+    public static boolean contains(String companyName) {
+        return COMPANY_NAMES.contains(companyName);
+    }
+}

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderItemScrmMapper.java

@@ -145,10 +145,15 @@ public interface FsStoreOrderItemScrmMapper
     List<FsStoreOrderItemExportVO> selectFsStoreOrderItemListExportVO(@Param("maps")FsStoreOrderParam fsStoreOrder);
 
     @Select({"<script> " +
-            "select count(0) from fs_store_order_item_scrm i left join fs_store_order_scrm o on o.id=i.order_id left join fs_user u on o.user_id=u.user_id  " +
-            " left join fs_store_product_package_scrm p on o.package_id=p.package_id left join company c on c.company_id=o.company_id left join company_user cu on cu.user_id=o.company_user_id left join company_tcm_schedule cts on cts.id = o.schedule_id " +
+            "select count(0) from fs_store_order_item_scrm i " +
+            "left join fs_store_order_scrm o on o.id=i.order_id " +
+            "left join fs_user u on o.user_id=u.user_id  " +
+            " left join fs_store_product_package_scrm p on o.package_id=p.package_id " +
+            "left join company c on c.company_id=o.company_id " +
+            "left join company_user cu on cu.user_id=o.company_user_id " +
+            "left join company_tcm_schedule cts on cts.id = o.schedule_id " +
             "LEFT JOIN fs_store_order_df df on df.order_id=o.id\n" +
-            "        <if test=\"maps.coursePlaySourceConfigId != null\">\n" +
+            "        <if test=\"maps.appId != null and maps.appId != ''\">\n" +
             "            LEFT JOIN (\n" +
             "            SELECT\n" +
             "            sp.*,\n" +
@@ -159,9 +164,9 @@ public interface FsStoreOrderItemScrmMapper
             "            LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id\n" +
             "        </if>" +
             "where 1=1 " +
-            "<if test=\"maps.coursePlaySourceConfigId != null\">\n" +
-            "                and csc.id = #{maps.coursePlaySourceConfigId}\n" +
-            "            </if>\n" +
+            "<if test=\"maps.appId != null and maps.appId != ''\">\n" +
+            "   and csc.appid = #{maps.appId}\n" +
+            " </if>\n" +
             "            <if test=\"maps.orderCodes != null  and maps.orderCodes.size > 0\">\n" +
             "                and o.order_code in\n" +
             "                <foreach collection=\"maps.orderCodes\" item=\"orderCode\" open=\"(\" close=\")\" separator=\",\">\n" +

fs-service/src/main/java/com/fs/hisStore/mapper/FsStorePaymentScrmMapper.java

@@ -74,7 +74,15 @@ public interface FsStorePaymentScrmMapper
     FsStorePaymentScrm selectFsStorePaymentByCode(String payCode);
 
     @Select({"<script> " +
-            "select p.*,o.order_code,c.company_name,d.dept_name,u.phone as user_phone,cu.nick_name as company_user_nick_name,cu.user_name as company_user_name  from fs_store_payment_scrm p left join company_user cu on p.company_user_id=cu.user_id left join fs_user u on u.user_id=p.user_id left join company_dept d on d.dept_id=p.dept_id left join company c on c.company_id=p.company_id left join fs_store_order_scrm o on o.id=p.order_id   " +
+            "select p.*,o.order_code,c.company_name,d.dept_name,u.phone as user_phone," +
+            "cu.nick_name as company_user_nick_name,cu.user_name as company_user_name ,csc.name miniProgramName " +
+            "from fs_store_payment_scrm p " +
+            "left join company_user cu on p.company_user_id=cu.user_id " +
+            "left join fs_user u on u.user_id=p.user_id " +
+            "left join company_dept d on d.dept_id=p.dept_id " +
+            "left join company c on c.company_id=p.company_id " +
+            "left join fs_store_order_scrm o on o.id=p.order_id   " +
+            "LEFT JOIN fs_course_play_source_config csc ON csc.appid = p.app_id " +
             "where 1=1 " +
             "<if test = 'maps.payCode != null and  maps.payCode !=\"\"    '> " +
             "and p.pay_code like CONCAT('%',#{maps.payCode},'%') " +
@@ -131,6 +139,7 @@ public interface FsStorePaymentScrmMapper
             " AND date_format(p.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(p.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
             "</if>" +
+            "<if test=\"maps.appId != null and maps.appId != ''\">  and p.app_id like #{maps.appId}</if>\n" +
 
 //            "<if test = 'maps.refundTime != null    '> " +
 //            "and DATE_FORMAT(p.refund_time,'%Y-%m-%d') = DATE_FORMAT(#{maps.refundTime},'%Y-%m-%d')  " +
@@ -143,8 +152,15 @@ public interface FsStorePaymentScrmMapper
 
     @Select({"<script> " +
             "select p.*,o.order_code,fsp.title, c.company_name,u.phone as user_phone,cu.nick_name as company_user_nick_name,cu.user_name as company_user_name " +
-            ",(select group_concat(dd.dept_name separator  '>') from company_dept dd where p.dept_id=dd.dept_id or find_in_set(dd.dept_id,d.ancestors)) as dept_name "+
-            " from fs_store_payment_scrm p left join company_user cu on p.company_user_id=cu.user_id left join fs_user u on u.user_id=p.user_id left join company_dept d on d.dept_id=p.dept_id left join company c on c.company_id=p.company_id left join fs_store_order_scrm o on o.id=p.order_id left join fs_store_product_package_scrm fsp on o.package_id = fsp.package_id " +
+            ",(select group_concat(dd.dept_name separator  '>') from company_dept dd where p.dept_id=dd.dept_id or find_in_set(dd.dept_id,d.ancestors)) as dept_name ,csc.name miniProgramName "+
+            " from fs_store_payment_scrm p " +
+            "left join company_user cu on p.company_user_id=cu.user_id " +
+            "left join fs_user u on u.user_id=p.user_id " +
+            "left join company_dept d on d.dept_id=p.dept_id " +
+            "left join company c on c.company_id=p.company_id " +
+            "left join fs_store_order_scrm o on o.id=p.order_id " +
+            "left join fs_store_product_package_scrm fsp on o.package_id = fsp.package_id " +
+            "LEFT JOIN fs_course_play_source_config csc ON csc.appid = p.app_id " +
             "where 1=1 " +
             "<if test = 'maps.payCode != null and  maps.payCode !=\"\"    '> " +
             "and p.pay_code like CONCAT('%',#{maps.payCode},'%') " +
@@ -186,6 +202,7 @@ public interface FsStorePaymentScrmMapper
             " AND date_format(p.create_time,'%y%m%d') &gt;= date_format(#{maps.createTimeList[0]},'%y%m%d') " +
             " AND date_format(p.create_time,'%y%m%d') &lt;= date_format(#{maps.createTimeList[1]},'%y%m%d') " +
             "</if>" +
+            "<if test=\"maps.appId != null and maps.appId != ''\">  and p.app_id like #{maps.appId}</if>\n" +
             " ${maps.params.dataScope} "+
             " order by p.payment_id desc limit 30000  "+
             "</script>"})

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductCategoryScrmMapper.java

@@ -112,4 +112,5 @@ public interface FsStoreProductCategoryScrmMapper
     @Select("select cate_id dict_value, cate_name dict_label,is_del status from fs_store_product_category_scrm WHERE pid = 0 and is_del=0 ")
     List<OptionsVO> selectFsStoreProductPidList();
 
+    List<Long> selectCateIdsByName(FsStoreProductCategoryScrm fsStoreProductCategoryScrm);
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -215,6 +215,12 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.salesOrder != null  and maps.salesOrder==\"asc\" '> " +
             "order by p.sales asc " +
             "</if>" +
+            " <if test = 'maps.cateIds != null and maps.cateIds.size() > 0'>\n" +
+            "        and p.cate_id in \n" +
+            "        <foreach collection='maps.cateIds' item='cateId' open='(' separator=',' close=')'>\n" +
+            "            #{cateId}\n" +
+            "        </foreach>\n" +
+            "    </if>"+
             "<if test = 'maps.newOrder != null and maps.newOrder==\"desc\" '> " +
             "and p.is_new =1 order by p.create_time desc  " +
             "</if>" +

fs-service/src/main/java/com/fs/hisStore/param/FsStoreOrderParam.java

@@ -111,4 +111,6 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     //导出字段
     private String filter;
 
+    private String appId;
+
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStorePaymentParam.java

@@ -46,4 +46,8 @@ public class FsStorePaymentParam  extends BaseEntity implements Serializable
     private String createTimeRange;
 
     private String[] createTimeList;
+
+    // 小程序ID
+    private Long coursePlaySourceConfigId;
+    private String appId;
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreProductQueryParam.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class FsStoreProductQueryParam extends BaseQueryParam implements Serializable
@@ -23,6 +24,8 @@ public class FsStoreProductQueryParam extends BaseQueryParam implements Serializ
     private String salesOrder;
     @ApiModelProperty(value = "1 只显示商城展示的商品 0展示所有")
     private Integer isDisplay=1;
+    // 1-家庭应急
+    private String productFlag;
 
     // token 需用户端传入
     private String token;
@@ -35,4 +38,6 @@ public class FsStoreProductQueryParam extends BaseQueryParam implements Serializ
 
     //是否多店铺 1是
     private Integer isStores;
+
+    List<Long> cateIds;
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -983,17 +983,21 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             redisCache.setCacheObject("orderAmount:" + storeOrder.getId(), storeOrder.getPayMoney(), 24, TimeUnit.HOURS);//物流代收自定义金额
             //删除推荐订单KEY
             String createOrderKey = param.getCreateOrderKey();
-            if (StringUtils.isNotEmpty(createOrderKey)) {
-                if (config.getIsBrushOrders() == null || !(config.getIsBrushOrders() && param.getCompanyUserId() != null)) {//未开启刷单
-                    redisCache.deleteObject("createOrderKey:" + createOrderKey);
-                    redisCache.deleteObject("orderCarts:" + createOrderKey);
-                    redisCache.deleteObject("createOrderMoney:" + createOrderKey);
-                }
-
-                //货到付款自定义金额 key改为id存储
+            if("鸿森堂".equals(cloudHostProper.getCompanyName())){
                 BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + createOrderKey);
-                redisCache.deleteObject("createOrderAmount:" + createOrderKey);
                 redisCache.setCacheObject("orderAmount:" + storeOrder.getId(), amount, 24, TimeUnit.HOURS);//物流代收自定义金额
+            }else {
+                if (StringUtils.isNotEmpty(createOrderKey)) {
+                    if (config.getIsBrushOrders() == null || !(config.getIsBrushOrders() && param.getCompanyUserId() != null)) {//未开启刷单
+                        redisCache.deleteObject("createOrderKey:" + createOrderKey);
+                        redisCache.deleteObject("orderCarts:" + createOrderKey);
+                        redisCache.deleteObject("createOrderMoney:" + createOrderKey);
+                    }
+
+                    //货到付款自定义金额 key改为id存储
+                    BigDecimal amount = redisCache.getCacheObject("createOrderAmount:" + createOrderKey);
+                    redisCache.deleteObject("createOrderAmount:" + createOrderKey);
+                }
             }
             return R.ok().put("order", storeOrder).put("payLimitTime", payLimitTime);
         } else {
@@ -3987,6 +3991,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                         mt.setPaymentId(storePayment.getPaymentId());
                         mt.setTradeNo(result.getHf_seq_id());
                         mt.setAppId(param.getAppId());
+                        mt.setBusinessCode(order.getOrderCode());
                         fsStorePaymentMapper.updateFsStorePayment(mt);
                         redisCache.setCacheObject("isPaying:"+order.getId(),order.getId().toString(),1, TimeUnit.MINUTES);
                         Map<String, Object> resultMap = JSON.parseObject(result.getPay_info(), new TypeReference<Map<String, Object>>() {});

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -28,6 +28,7 @@ import com.fs.his.vo.FsStoreProductListSVO;
 import com.fs.his.vo.OptionsVO;
 import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.hisStore.domain.*;
+import com.fs.hisStore.enums.CompanyEnum;
 import com.fs.hisStore.mapper.*;
 import com.fs.hisStore.utils.StoreAuditLogUtil;
 import com.fs.statis.dto.ModifyMoreDTO;
@@ -97,6 +98,8 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
 
     @Autowired
     private CloudHostProper cloudHostProper;
+    @Autowired
+    private FsStoreProductCategoryScrmMapper fsStoreProductCategoryScrmMapper;
 
     /**
      * 查询商品
@@ -338,7 +341,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         product.setStoreId(param.getStoreId());
         product.setIsDrug(param.getIsDrug().toString());
         //校验店铺资质信息
-        if(!("益善缘".equals(cloudHostProper.getCompanyName())) && !("康年堂".equals(cloudHostProper.getCompanyName())) && !("纯正堂".equals(cloudHostProper.getCompanyName()))){
+        if (!CompanyEnum.contains(cloudHostProper.getCompanyName())) {
             //获取店铺
             FsStoreScrm store = fsStoreScrmService.selectFsStoreByStoreId(product.getStoreId());
             if(store == null || 1 != store.getStatus()){
@@ -416,7 +419,6 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
         return R.ok();
     }
 
-
     private void addProductAttr(Long productId, List<ProductArrtDTO> items, List<FsStoreProductAttrValueScrm> values){
         //清空attr
         fsStoreProductAttrMapper.clear(productId);
@@ -690,6 +692,22 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     public List<FsStoreProductListQueryVO> selectFsStoreProductListQuery(FsStoreProductQueryParam param) {
         boolean stores = medicalMallConfig.isStores();
         param.setIsStores(stores?1:0);
+        // 蒙一堂特殊产品展示
+        List<Long>  cateIds;
+        if("1".equals(param.getProductFlag())){// 家庭应急
+            // fs_store_product_category_scrm
+            FsStoreProductCategoryScrm fsStoreProductCategoryScrm = new FsStoreProductCategoryScrm();
+            fsStoreProductCategoryScrm.setPid(0L);
+            fsStoreProductCategoryScrm.setCateName("家庭应急");
+            cateIds =fsStoreProductCategoryScrmMapper.selectCateIdsByName(fsStoreProductCategoryScrm);
+            if(cateIds!= null && !cateIds.isEmpty()){
+                param.setCateIds(cateIds);
+            }else {
+                // 不让查询出来
+                return new ArrayList<>();
+            }
+        }
+
         return fsStoreProductMapper.selectFsStoreProductListQuery(param);
     }
 

fs-service/src/main/java/com/fs/hisStore/vo/FsStorePaymentVO.java

@@ -90,6 +90,10 @@ public class FsStorePaymentVO implements Serializable
 
     private String payMode;
 
+    // 小程序名称
+    @Excel(name = "所属小程序")
+    private String miniProgramName;
+
 
 
 }

fs-service/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -251,8 +251,11 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
             "    </foreach>\n" +
             "    )"+
             "</if> " +
-
-//            "            <if test=\"remarkMobiles != null  and remarkMobiles != ''\"> and ec.remark_mobiles like concat( #{remarkMobiles}, '%')</if>\n" +
+            "<if test='outTagIds !=null'>\n" +
+            "    AND <foreach collection=\"outTagIds\" item=\"item\" open=\"(\" separator=\" AND \" close=\")\">\n" +
+            "        NOT find_in_set(#{item}, REGEXP_REPLACE(ec.tag_ids, '[\\\"\\\\[\\\\]]', ''))\n" +
+            "    </foreach>\n" +
+            "</if>"+
             "<if test=\"remarkMobiles != null and remarkMobiles != ''\">\n" +
             "    AND ec.search_mobile LIKE concat(#{remarkMobiles}, '%')\n" +
             "</if>" +

fs-service/src/main/java/com/fs/qw/mapper/QwTagMapper.java

@@ -70,14 +70,16 @@ public interface QwTagMapper
      */
     public int deleteQwTagByIds(Long[] ids);
     @Select({"<script> " +
-            "select * from qw_tag "+
+            " select t1.*,t2.corp_name from qw_tag t1 "+
+            " inner join qw_company t2 on t1.corp_id = t2.corp_id " +
             "<where>\n" +
-            "            <if test=\"tagId != null  and tagId != ''\"> and tag_id = #{tagId}</if>\n" +
-            "            <if test=\"name != null  and name != ''\"> and name like concat('%', #{name}, '%')</if>\n" +
-            "            <if test=\"groupId != null  and groupId != ''\"> and group_id = #{groupId}</if>\n" +
-            "            <if test=\"order != null  and order != ''\"> and `order` = #{order}</if>\n" +
-            "            <if test=\"corpId != null  and corpId != ''\"> and corp_id = #{corpId}</if>\n" +
-            "            <if test=\"companyId != null \"> and company_id = #{companyId}</if>\n" +
+            "            <if test=\"tagId != null  and tagId != ''\"> and t1.tag_id = #{tagId}</if>\n" +
+            "            <if test=\"name != null  and name != ''\"> and t1.name like concat('%', #{name}, '%')</if>\n" +
+            "            <if test=\"groupId != null  and groupId != ''\"> and t1.group_id = #{groupId}</if>\n" +
+            "            <if test=\"order != null  and order != ''\"> and t1.`order` = #{order}</if>\n" +
+            "            <if test=\"corpId != null  and corpId != ''\"> and t1.corp_id = #{corpId}</if>\n" +
+//            "            <if test=\"companyId != null \"> and t1.company_id = #{companyId}</if>\n" +
+            "            <if test=\"companyId != null \">and FIND_IN_SET(#{companyId},t2.company_ids) </if>\n" +
             "</where>"+
             "</script>"})
     List<QwTagVO> selectQwTagListVO(QwTag qwTag);

fs-service/src/main/java/com/fs/qw/mapper/QwWatchLogMapper.java

@@ -145,7 +145,7 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "<if test ='nickName !=null and nickName!=\"\"'>\n" +
             "   and qu.qw_user_name like concat( #{nickName}, '%')\n" +
             "</if>" +
-            "<if test ='deptId !=null and deptId!=\"\"'>\n" +
+            "<if test ='(deptIds ==null or deptIds.size = 0) and deptId !=null and deptId!=\"\"'>\n" +
             "   and cu.dept_id = #{deptId}\n" +
             "</if>" +
             " <if test=\"filterDeptIds != null and filterDeptIds.size() != 0\">\n" +
@@ -154,6 +154,12 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "         ${item}\n" +
             "      </foreach>\n" +
             " </if> " +
+            "<if test ='deptIds !=null and deptIds.size > 0'>\n" +
+            "and cu.dept_id in" +
+            "<foreach collection=\"deptIds\" item=\"deptId\" index=\"index\"  separator=\",\" open=\"(\" close=\")\">\n" +
+            "     #{deptId}\n" +
+            "</foreach>" +
+            "</if>" +
             "<if test ='ids !=null and ids!=\"\"'>\n" +
             "   and qec.qw_user_id in (${ids})\n" +
             "</if>" +
@@ -212,6 +218,63 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "    DATE(qec.create_time) "+
             "</script>"})
     List<QwWatchLogStatisticsListVO> selectQwExtCountByDayAndOther(FsCourseWatchLogListParam param);
+
+    @Select({"<script> " +
+            "SELECT\n" +
+            "    qec.qw_user_id id,\n" +
+            "    qu.qw_user_name AS qw_user_name, \n" +
+            "    DATE(qec.create_time) AS create_time, \n" +
+            "    COUNT(1) AS line,\n" +
+            "    COUNT(CASE WHEN qec.is_interact = 1 THEN 1 END) AS interact,\n" +
+            "    COUNT(CASE WHEN qec.`level` = 1 THEN 1 END) AS A,\n" +
+            "    COUNT(CASE WHEN qec.`level` = 2 THEN 1 END) AS B,\n" +
+            "    COUNT(CASE WHEN qec.`level` = 3 THEN 1 END) AS C,\n" +
+            "    COUNT(CASE WHEN qec.`level` = 4 THEN 1 END) AS D,\n" +
+            "    COUNT(CASE WHEN qec.`level` = 5 THEN 1 END) AS E,\n" +
+            "    COUNT(CASE WHEN qec.fs_user_id IS NOT NULL THEN 1 END) AS sign,\n" +
+            "    COUNT(CASE WHEN qec.`status` =3 THEN 1 END) AS los,\n" +
+            "    COUNT(CASE WHEN qec.`status` IN (4, 5,6) THEN 1 END) AS del\n" +
+            "FROM\n" +
+            "    qw_external_contact qec\n" +
+            "JOIN\n" +
+            "    qw_user qu ON qec.qw_user_id = qu.id \n" +
+            "left join company_user cu on qec.company_user_id = cu.user_id "+
+            "WHERE\n" +
+            "    DATE(qec.create_time) &gt;= DATE(#{sTime}) and  DATE(qec.create_time) &lt;= DATE(#{eTime}) and qec.company_id =#{companyId} " +
+            " and NOT EXISTS (\n" +
+            " SELECT 1 \n" +
+            " FROM qw_external_contact_transfer_log t " +
+            " WHERE t.external_contact_id = qec.id " +
+            " AND DATE(t.create_time) &gt;= DATE(#{sTime}) \n" +
+            " AND DATE(t.create_time) &lt;= DATE(#{eTime})\n" +
+            " )" +
+            "<if test ='nickName !=null and nickName!=\"\"'>\n" +
+            "   and qu.qw_user_name like concat( #{nickName}, '%')\n" +
+            "</if>" +
+            "<if test ='deptIds !=null and deptIds.size > 0'>\n" +
+            "and cu.dept_id in" +
+            "<foreach collection=\"deptIds\" item=\"deptId\" index=\"index\"  separator=\",\" open=\"(\" close=\")\">\n" +
+            "     #{deptId}\n" +
+            "</foreach>" +
+            "</if>" +
+            "<if test ='(deptIds == null or deptIds.size == 0) and deptId !=null and deptId!=\"\"'>\n" +
+            "   and cu.dept_id = #{deptId}\n" +
+            "</if>" +
+            " <if test=\"deptIds != null and deptIds.size() != 0\">\n" +
+            "     and cu.dept_id  in\n" +
+            "      <foreach collection=\"deptIds\" item=\"item\" open=\"(\" close=\")\" separator=\",\">\n" +
+            "         ${item}\n" +
+            "      </foreach>\n" +
+            " </if> " +
+            "<if test ='ids !=null and ids!=\"\"'>\n" +
+            "   and qec.qw_user_id in (${ids})\n" +
+            "</if>" +
+            "GROUP BY\n" +
+            "    qec.qw_user_id, DATE(qec.create_time) \n" +
+            "ORDER BY\n" +
+            "    DATE(qec.create_time) "+
+            "</script>"})
+    List<QwWatchLogStatisticsListVO> selectQwExtCountByDayAndOtherExcludeTransfer(FsCourseWatchLogListParam param);
     @Select("select \n" +
             "COUNT(CASE WHEN day = 0 and status in (1,2) THEN 1 END) AS firstOnline,\n" +
             "COUNT(CASE WHEN day = 0 and status=2 THEN 1 END) AS firstOver,\n" +

fs-service/src/main/java/com/fs/qw/param/QwExternalContactParam.java

@@ -70,6 +70,11 @@ public class QwExternalContactParam {
     @Excel(name = "标签id")
     private List<String> tagIds;
 
+
+    /** 排除的标签id */
+    @Excel(name = "排除标签id")
+    private List<String> outTagIds;
+
     private String remark;
 
     /** 备注电话号码 */

fs-service/src/main/java/com/fs/qw/param/QwExternalContactUpdateNoteParam.java

@@ -1,5 +1,6 @@
 package com.fs.qw.param;
 
+import com.fs.course.param.FsCourseWatchLogListParam;
 import lombok.Data;
 
 import java.util.List;
@@ -13,4 +14,8 @@ public class QwExternalContactUpdateNoteParam {
     private Integer addType;
     private boolean filter;
     private QwExternalContactParam param;
+    private List<Long> watchLogIds;
+    //来源于我的看课记录 1 来源于看课记录 0
+    private Integer fromMyList;
+    private FsCourseWatchLogListParam watchLogParam;
 }

fs-service/src/main/java/com/fs/qw/param/QwTagParam.java

@@ -12,4 +12,9 @@ public class QwTagParam  {
     /** 企业id */
     @Excel(name = "企业id")
     private String corpId;
+
+    /**
+     * 公司id
+     */
+    private Long companyId;
 }

fs-service/src/main/java/com/fs/qw/service/IQwWatchLogService.java

@@ -81,4 +81,6 @@ public interface IQwWatchLogService extends IService<QwWatchLog>{
     TableDataInfo selectQwWatchLogStatisticsListVONew(QwWatchLogStatisticsListParam param);
 
     List<QwWatchLogStatisticsListVO> selectQwWatchLogStatisticsListVOExport(FsCourseWatchLogListParam param);
+
+    List<QwWatchLogStatisticsListVO> selectQwWatchLogStatisticsListVOExportExcludeTransfer(FsCourseWatchLogListParam param);
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -4339,9 +4339,9 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
     @Override
     public void deletefollowUserByExternalUserId(String externalUserID, String userID, String corpId) {
 
-        //客户删除销售-找这个销售的sop任务中所有的营期里有没有这个客户，删了(暂时不要删-这种流失的有些一样能发消息)
-//        sopUserLogsInfoMapper.deleteByQwUserIdAndCorpIdToContactId(userID,corpId, externalUserID);
-//        logger.error("客户删除销售-"+"|"+externalUserID+"|"+userID+"|"+corpId);
+        //客户删除销售-找这个销售的sop任务中所有的营期里有没有这个客户-流失客户删除
+        sopUserLogsInfoMapper.deleteByQwUserIdAndCorpIdToContactId(userID,corpId, externalUserID);
+        logger.error("客户删除销售-"+"|"+externalUserID+"|"+userID+"|"+corpId);
 
         QwExternalContact qwExternalContact = qwExternalContactMapper.selectQwExternalContactUserIdAndExternalIdAndCompanyId(externalUserID, userID, corpId);
         if (qwExternalContact != null) {

fs-service/src/main/java/com/fs/qw/service/impl/QwTagServiceImpl.java

@@ -74,6 +74,7 @@ public class QwTagServiceImpl implements IQwTagService
         QwTag qwTag = new QwTag();
         qwTag.setName(tagParam.getName());
         qwTag.setCorpId(tagParam.getCorpId());
+        qwTag.setCompanyId(tagParam.getCompanyId());
         List<QwTagVO> qwTags = qwTagMapper.selectQwTagListVO(qwTag);
 
         // Step 2: 提取 GroupId 列表（去重）

fs-service/src/main/java/com/fs/qw/service/impl/QwUserComplainRecordServiceImpl.java

@@ -1,6 +1,8 @@
 package com.fs.qw.service.impl;
 
 import java.util.List;
+
+import com.alibaba.fastjson.JSON;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.course.domain.FsUserCourseComplaintRecord;
@@ -155,7 +157,7 @@ public class QwUserComplainRecordServiceImpl extends ServiceImpl<QwUserComplainR
         textCard.setUrl("https://www.baidu.com/");
         textCard.setBtntxt("详情");
         sendMsgParam.setTextcard(textCard);
-        log.info("发送投诉信息请求体：{}",sendMsgParam);
+        log.info("发送投诉信息请求体：{}", JSON.toJSONString(sendMsgParam));
         //发送消息
         QwSendMsgResult result = qwApiService.sendMsg(sendMsgParam, qwCompany.getCorpId());
         log.info("发送投诉应用消息返回：{}",result);

fs-service/src/main/java/com/fs/qw/service/impl/QwWatchLogServiceImpl.java

@@ -183,6 +183,44 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         }
         return vos;
     }
+    @Override
+    public List<QwWatchLogStatisticsListVO> selectQwWatchLogStatisticsListVOExportExcludeTransfer(FsCourseWatchLogListParam param) {
+        List<Long> deptIds = param.getDeptIds();
+        if (deptIds !=null && !deptIds.isEmpty()){
+            List<CompanyDept> companyDeptList  = companyDeptMapper.selectCompanyDeptByIds(deptIds);
+            if (companyDeptList!=null && !companyDeptList.isEmpty()){
+                for (CompanyDept c : companyDeptList) {
+                    if (c.getParentId() == 0L) {
+                        param.setDeptId(null);
+                        param.setDeptIds(null);
+                        break;
+                    }
+                }
+            }
+        } else {
+            CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(param.getDeptId());
+            if (ObjectUtils.isNotEmpty(companyDept)&&companyDept.getParentId()==0L){
+                param.setDeptId(null);
+            }
+        }
+
+
+        if (param.getCompanyUserId()!=null){
+            param.setIds(companyUserMapper.selectQwUserIdsByCompany(param.getCompanyUserId()));
+        }
+//        List<QwWatchLogStatisticsListVO> vos = qwWatchLogMapper.selectQwExtCountByDayAndOther(param);
+        List<QwWatchLogStatisticsListVO> vos = qwWatchLogMapper.selectQwExtCountByDayAndOtherExcludeTransfer(param);
+        for (QwWatchLogStatisticsListVO vo : vos) {
+            Long id = vo.getId();
+            Date createTime = vo.getCreateTime();
+            QwWatchLogStatisticsListVO stat = qwWatchLogMapper.selectQwWatchLogByQwUserId(id, createTime);
+            vo.setD1Online(stat.getD1Online());
+            vo.setD1Over(stat.getD1Over());
+            vo.setFirstOnline(stat.getFirstOnline());
+            vo.setFirstOver(stat.getFirstOver());
+        }
+        return vos;
+    }
 
     @Override
     public TableDataInfo selectQwWatchLogStatisticsListVO(QwWatchLogStatisticsListParam param) {
@@ -246,14 +284,32 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
      */
     @Override
     public TableDataInfo selectQwWatchLogStatisticsListVOExcludeTransfer(QwWatchLogStatisticsListParam param){
-        CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(param.getDeptId());
-        if (ObjectUtils.isNotEmpty(companyDept)&&companyDept.getParentId()==0L){
-            param.setDeptId(null);
-        }else {
-            //通过部门id去找到所有子部门id
-            List<Long> currentDeptIdDownTreeIds = companyDeptMapper.getCurrentDeptIdDownTreeIds(param.getDeptId());
-            param.setFilterDeptIds(currentDeptIdDownTreeIds);
-            param.setDeptId(null);
+//        CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(param.getDeptId());
+//        if (ObjectUtils.isNotEmpty(companyDept)&&companyDept.getParentId()==0L){
+//            param.setDeptId(null);
+//        }else {
+//            //通过部门id去找到所有子部门id
+//            List<Long> currentDeptIdDownTreeIds = companyDeptMapper.getCurrentDeptIdDownTreeIds(param.getDeptId());
+//            param.setFilterDeptIds(currentDeptIdDownTreeIds);
+//            param.setDeptId(null);
+//        }
+        List<Long> deptIds = param.getDeptIds();
+        if (deptIds !=null && !deptIds.isEmpty()){
+            List<CompanyDept> companyDeptList  = companyDeptMapper.selectCompanyDeptByIds(deptIds);
+            if (companyDeptList!=null && !companyDeptList.isEmpty()){
+                for (CompanyDept c : companyDeptList) {
+                    if (c.getParentId() == 0L) {
+                        param.setDeptId(null);
+                        param.setDeptIds(null);
+                        break;
+                    }
+                }
+            }
+        } else {
+            CompanyDept companyDept = companyDeptMapper.selectCompanyDeptById(param.getDeptId());
+            if (ObjectUtils.isNotEmpty(companyDept)&&companyDept.getParentId()==0L){
+                param.setDeptId(null);
+            }
         }
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(HttpStatus.SUCCESS);

fs-service/src/main/java/com/fs/qw/vo/QwTagVO.java

@@ -28,5 +28,8 @@ public class QwTagVO {
      */
     private Integer tagFrom;
 
+    /** 主体名称 */
+    private String corpName;
+
 
 }

fs-service/src/main/java/com/fs/statis/mapper/ConsumptionBalanceMapper.java

@@ -100,12 +100,28 @@ public interface ConsumptionBalanceMapper {
      */
     List<DeaMemberTopTenDTO> deaMemberTopTen(AnalysisPreviewQueryDTO param);
 
-    /**
-     * 课程观看TOP10
-     * @param param 请求参数
-     * @return TOP10
-     */
-    List<CourseStatsDTO> watchCourseTopTen(AnalysisPreviewQueryDTO param);
+    // 按观看人数排序（只查观看数据）
+    List<CourseStatsDTO> watchCourseTopTenByWatch(AnalysisPreviewQueryDTO param);
+
+    // 按完成人数排序（只查观看数据）
+    List<CourseStatsDTO> watchCourseTopTenByComplete(AnalysisPreviewQueryDTO param);
+
+    // 按答题人数排序（需要关联答题表）
+    List<CourseStatsDTO> watchCourseTopTenByAnswer(AnalysisPreviewQueryDTO param);
+
+    // 按正确人数排序（需要关联答题表）
+    List<CourseStatsDTO> watchCourseTopTenByCorrect(AnalysisPreviewQueryDTO param);
+
+    // 批量补充答题数据
+    List<CourseStatsDTO> getAnswerStatsByCourseIds(@Param("courseIds") List<Long> courseIds, @Param("param") AnalysisPreviewQueryDTO param);
+
+
+//    /**
+//     * 课程观看TOP10
+//     * @param param 请求参数
+//     * @return TOP10
+//     */
+//    List<CourseStatsDTO> watchCourseTopTen(AnalysisPreviewQueryDTO param);
 
     /**
      * 奖励金额TOP10

fs-service/src/main/java/com/fs/statis/service/impl/StatisticsCompanyServiceImpl.java

@@ -40,6 +40,8 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.fs.statis.StatisticsRedisConstant.*;
@@ -983,14 +985,89 @@ public class StatisticsCompanyServiceImpl implements IStatisticsCompanyService {
 
     @Override
     public List<CourseStatsDTO> watchCourseTopTen(AnalysisPreviewQueryDTO param) {
-        List<CourseStatsDTO> courseStatsDTOS = consumptionBalanceMapper.watchCourseTopTen(param);
-        for (CourseStatsDTO courseStatsDTO : courseStatsDTOS) {
+//        List<CourseStatsDTO> courseStatsDTOS = consumptionBalanceMapper.watchCourseTopTen(param);
+//        for (CourseStatsDTO courseStatsDTO : courseStatsDTOS) {
+//            String courseName = fsUserCourseCacheService.selectCourseNameByCourseId(courseStatsDTO.getCourseId());
+//            if(StringUtils.isNotBlank(courseName)){
+//                courseStatsDTO.setCourseName(courseName);
+//            }
+//        }
+//        return courseStatsDTOS;
+        //2025.11.07 优化
+        // 1. 根据统计类型获取基础数据
+        List<CourseStatsDTO> result = getBaseCourseStats(param);
+
+        // 2. 如果查询的是观看或完成数据，需要补充答题数据
+        if (param.getStatisticalType() == 0 || param.getStatisticalType() == 1) {
+            supplementAnswerData(result, param);
+        }
+
+        // 3. 设置课程名称
+        setCourseNames(result);
+
+        return result;
+    }
+
+    /**
+     * 获取基础课程统计数据
+     */
+    private List<CourseStatsDTO> getBaseCourseStats(AnalysisPreviewQueryDTO param) {
+        Integer statisticalType = param.getStatisticalType();
+        switch (statisticalType) {
+            case 0: // 观看人数
+                return consumptionBalanceMapper.watchCourseTopTenByWatch(param);
+            case 1: // 完成人数
+                return consumptionBalanceMapper.watchCourseTopTenByComplete(param);
+            case 2: // 答题人数
+                return consumptionBalanceMapper.watchCourseTopTenByAnswer(param);
+            case 3: // 正确人数
+                return consumptionBalanceMapper.watchCourseTopTenByCorrect(param);
+            default:
+                return consumptionBalanceMapper.watchCourseTopTenByWatch(param);
+        }
+    }
+
+    /**
+     * 补充答题数据（针对观看和完成统计）
+     */
+    private void supplementAnswerData(List<CourseStatsDTO> result, AnalysisPreviewQueryDTO param) {
+        if (result == null || result.isEmpty()) {
+            return;
+        }
+
+        // 提取课程ID列表
+        List<Long> courseIds = result.stream()
+                .map(CourseStatsDTO::getCourseId)
+                .collect(Collectors.toList());
+
+        // 批量查询答题数据
+        List<CourseStatsDTO> answerStats = consumptionBalanceMapper.getAnswerStatsByCourseIds(courseIds, param);
+
+        // 构建课程ID到答题数据的映射
+        Map<Long, CourseStatsDTO> answerMap = answerStats.stream()
+                .collect(Collectors.toMap(CourseStatsDTO::getCourseId, Function.identity()));
+
+        // 合并答题数据到结果中
+        for (CourseStatsDTO dto : result) {
+            CourseStatsDTO answerStat = answerMap.get(dto.getCourseId());
+            if (answerStat != null) {
+                dto.setAnswerUserCount(answerStat.getAnswerUserCount());
+                dto.setCorrectUserCount(answerStat.getCorrectUserCount());
+            }
+            // 如果没有答题数据，保持原来的0值
+        }
+    }
+
+    /**
+     * 设置课程名称
+     */
+    private void setCourseNames(List<CourseStatsDTO> result) {
+        for (CourseStatsDTO courseStatsDTO : result) {
             String courseName = fsUserCourseCacheService.selectCourseNameByCourseId(courseStatsDTO.getCourseId());
-            if(StringUtils.isNotBlank(courseName)){
+            if (StringUtils.isNotBlank(courseName)) {
                 courseStatsDTO.setCourseName(courseName);
             }
         }
-        return courseStatsDTOS;
     }
 
     @Override

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

@@ -45,6 +45,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import com.fs.statistics.dto.WatchCourseStatisticsDTO;
 
@@ -896,14 +897,88 @@ public class StatisticsServiceImpl implements IStatisticsService {
 
     @Override
     public List<CourseStatsDTO> watchCourseTopTen(AnalysisPreviewQueryDTO param) {
-        List<CourseStatsDTO> courseStatsDTOS = consumptionBalanceMapper.watchCourseTopTen(param);
-        for (CourseStatsDTO courseStatsDTO : courseStatsDTOS) {
+//        List<CourseStatsDTO> courseStatsDTOS = consumptionBalanceMapper.watchCourseTopTen(param);
+//        for (CourseStatsDTO courseStatsDTO : courseStatsDTOS) {
+//            String courseName = fsUserCourseCacheService.selectCourseNameByCourseId(courseStatsDTO.getCourseId());
+//            if(StringUtils.isNotBlank(courseName)){
+//                courseStatsDTO.setCourseName(courseName);
+//            }
+//        }
+//        return courseStatsDTOS;
+        // 1. 根据统计类型获取基础数据
+        List<CourseStatsDTO> result = getBaseCourseStats(param);
+
+        // 2. 如果查询的是观看或完成数据，需要补充答题数据
+        if (param.getStatisticalType() == 0 || param.getStatisticalType() == 1) {
+            supplementAnswerData(result, param);
+        }
+
+        // 3. 设置课程名称
+        setCourseNames(result);
+
+        return result;
+    }
+
+    /**
+     * 获取基础课程统计数据
+     */
+    private List<CourseStatsDTO> getBaseCourseStats(AnalysisPreviewQueryDTO param) {
+        Integer statisticalType = param.getStatisticalType();
+        switch (statisticalType) {
+            case 0: // 观看人数
+                return consumptionBalanceMapper.watchCourseTopTenByWatch(param);
+            case 1: // 完成人数
+                return consumptionBalanceMapper.watchCourseTopTenByComplete(param);
+            case 2: // 答题人数
+                return consumptionBalanceMapper.watchCourseTopTenByAnswer(param);
+            case 3: // 正确人数
+                return consumptionBalanceMapper.watchCourseTopTenByCorrect(param);
+            default:
+                return consumptionBalanceMapper.watchCourseTopTenByWatch(param);
+        }
+    }
+
+    /**
+     * 补充答题数据（针对观看和完成统计）
+     */
+    private void supplementAnswerData(List<CourseStatsDTO> result, AnalysisPreviewQueryDTO param) {
+        if (result == null || result.isEmpty()) {
+            return;
+        }
+
+        // 提取课程ID列表
+        List<Long> courseIds = result.stream()
+                .map(CourseStatsDTO::getCourseId)
+                .collect(Collectors.toList());
+
+        // 批量查询答题数据
+        List<CourseStatsDTO> answerStats = consumptionBalanceMapper.getAnswerStatsByCourseIds(courseIds, param);
+
+        // 构建课程ID到答题数据的映射
+        Map<Long, CourseStatsDTO> answerMap = answerStats.stream()
+                .collect(Collectors.toMap(CourseStatsDTO::getCourseId, Function.identity()));
+
+        // 合并答题数据到结果中
+        for (CourseStatsDTO dto : result) {
+            CourseStatsDTO answerStat = answerMap.get(dto.getCourseId());
+            if (answerStat != null) {
+                dto.setAnswerUserCount(answerStat.getAnswerUserCount());
+                dto.setCorrectUserCount(answerStat.getCorrectUserCount());
+            }
+            // 如果没有答题数据，保持原来的0值
+        }
+    }
+
+    /**
+     * 设置课程名称
+     */
+    private void setCourseNames(List<CourseStatsDTO> result) {
+        for (CourseStatsDTO courseStatsDTO : result) {
             String courseName = fsUserCourseCacheService.selectCourseNameByCourseId(courseStatsDTO.getCourseId());
-            if(StringUtils.isNotBlank(courseName)){
+            if (StringUtils.isNotBlank(courseName)) {
                 courseStatsDTO.setCourseName(courseName);
             }
         }
-        return courseStatsDTOS;
     }
 
     @Override

fs-service/src/main/java/com/fs/tag/service/impl/FsTagUpdateServiceImpl.java

@@ -175,7 +175,9 @@ public class FsTagUpdateServiceImpl implements FsTagUpdateService {
         }
 
 
-        fsTagUpdateQueueMapper.batchInsert(batchData);
+        if(CollectionUtils.isNotEmpty(batchData)){
+            fsTagUpdateQueueMapper.batchInsert(batchData);
+        }
     }
 
 
@@ -257,7 +259,9 @@ public class FsTagUpdateServiceImpl implements FsTagUpdateService {
         }
 
 
-        fsTagUpdateQueueMapper.batchInsert(batchData);
+        if(CollectionUtils.isNotEmpty(batchData)){
+            fsTagUpdateQueueMapper.batchInsert(batchData);
+        }
     }
 
     @Override

fs-service/src/main/java/com/fs/tag/service/impl/FsVideoCourseTagServiceImpl.java

@@ -13,7 +13,9 @@ import com.fs.qw.mapper.QwTagMapper;
 import com.fs.tag.domain.FsVideoCourseTag;
 import com.fs.tag.mapper.FsVideoCourseTagMapper;
 import com.fs.tag.service.IFsVideoCourseTagService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
 /**
@@ -22,6 +24,7 @@ import org.springframework.stereotype.Service;
  * @author fs
  * @date 2025-11-05
  */
+@Slf4j
 @Service
 public class FsVideoCourseTagServiceImpl extends ServiceImpl<FsVideoCourseTagMapper, FsVideoCourseTag> implements IFsVideoCourseTagService {
 
@@ -94,8 +97,13 @@ public class FsVideoCourseTagServiceImpl extends ServiceImpl<FsVideoCourseTagMap
     @Override
     public int insertFsVideoCourseTag(FsVideoCourseTag fsVideoCourseTag)
     {
-        fsVideoCourseTag.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertFsVideoCourseTag(fsVideoCourseTag);
+        try{
+            fsVideoCourseTag.setCreateTime(DateUtils.getNowDate());
+            return baseMapper.insertFsVideoCourseTag(fsVideoCourseTag);
+        }catch (DuplicateKeyException e){
+            log.info("同一主体的小节添加标签不允许重复！");
+            throw new RuntimeException("同一主体的小节添加标签不允许重复！");
+        }
     }
 
     /**

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

@@ -91,7 +91,7 @@ cloud_host:
 headerImg:
   imgUrl: https://hat-1323137866.cos.ap-chongqing.myqcloud.com/fs/20250928/hatlogo.png
 ipad:
-  ipadUrl: http://ipad.****.cn
+  ipadUrl: http://hatipad.ylrzcloud.com
   aiApi: http://62:3000/api
   voiceApi:
   commonApi:

fs-service/src/main/resources/application-druid-knt2.yml

@@ -9,7 +9,7 @@ spring:
         # 端口，默认为6379
         port: 6379
         # 数据库索引
-        database: 2
+        database: 1
         # 密码
         password: Ylrztek250218!3@.
         # 连接超时时间

fs-service/src/main/resources/mapper/company/CompanyDeductMapper.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.CompanyDeductMapper">
-    
+
     <resultMap type="CompanyDeduct" id="CompanyDeductResult">
         <result property="deductId"    column="deduct_id"    />
         <result property="deductNo"    column="deduct_no"    />
@@ -16,15 +16,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="auditUserId"    column="audit_user_id"    />
         <result property="auditTime"    column="audit_time"    />
         <result property="remark"    column="remark"    />
+        <result property="businessType"    column="business_type"    />
     </resultMap>
 
     <sql id="selectCompanyDeductVo">
-        select deduct_id, deduct_no, company_id, money, balance, create_time, create_user_id, is_audit, audit_user_id, audit_time,remark from company_deduct
+        select deduct_id, deduct_no, company_id, money, balance, create_time, create_user_id, is_audit, audit_user_id, audit_time,remark, business_type from company_deduct
     </sql>
 
     <select id="selectCompanyDeductList" parameterType="CompanyDeduct" resultMap="CompanyDeductResult">
         <include refid="selectCompanyDeductVo"/>
-        <where>  
+        <where>
             <if test="deductNo != null  and deductNo != ''"> and deduct_no = #{deductNo}</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="money != null "> and money = #{money}</if>
@@ -35,12 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditTime != null "> and audit_time = #{auditTime}</if>
         </where>
     </select>
-    
+
     <select id="selectCompanyDeductById" parameterType="Long" resultMap="CompanyDeductResult">
         <include refid="selectCompanyDeductVo"/>
         where deduct_id = #{deductId}
     </select>
-        
+
     <insert id="insertCompanyDeduct" parameterType="CompanyDeduct" useGeneratedKeys="true" keyProperty="deductId">
         insert into company_deduct
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditUserId != null">audit_user_id,</if>
             <if test="auditTime != null">audit_time,</if>
             <if test="remark != null">remark,</if>
+            <if test="businessType != null">business_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deductNo != null">#{deductNo},</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="auditUserId != null">#{auditUserId},</if>
             <if test="auditTime != null">#{auditTime},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="businessType != null">#{businessType},</if>
          </trim>
     </insert>
 
@@ -91,10 +94,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCompanyDeductByIds" parameterType="String">
-        delete from company_deduct where deduct_id in 
+        delete from company_deduct where deduct_id in
         <foreach item="deductId" collection="array" open="(" separator="," close=")">
             #{deductId}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>

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

@@ -60,7 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         fs_course_traffic_log
         <where>
-            DATE(create_time) = CURDATE()
+            <!-- DATE(create_time) = CURDATE() -->
+            create_time >= CURDATE()
+            AND create_time &lt; CURDATE() + INTERVAL 1 DAY
             <if test="companyId != null">
                 AND company_id = ${companyId}
             </if>
@@ -85,8 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         fs_course_traffic_log
         <where>
-            YEAR(create_time) = YEAR(CURDATE())
-            AND MONTH(create_time) = MONTH(CURDATE())
+            <!-- YEAR(create_time) = YEAR(CURDATE()) -->
+            <!-- AND MONTH(create_time) = MONTH(CURDATE()) -->
+            create_time >= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+            AND create_time &lt; DATE_FORMAT(CURDATE() + INTERVAL 1 MONTH, '%Y-%m-01')
             <if test="companyId != null">
                 AND company_id = ${companyId}
             </if>
@@ -114,8 +118,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
             fs_course_traffic_log
         WHERE
-            YEAR(create_time) = YEAR(CURDATE())
-          AND MONTH(create_time) = MONTH(CURDATE())
+        <!-- YEAR(create_time) = YEAR(CURDATE()) -->
+        <!-- AND MONTH(create_time) = MONTH(CURDATE()) -->
+        create_time >= DATE_FORMAT(CURDATE(), '%Y-%m-01')
+        AND create_time &lt; DATE_FORMAT(CURDATE() + INTERVAL 1 MONTH, '%Y-%m-01')
     </select>
 
     <insert id="insertFsCourseTrafficLog" parameterType="FsCourseTrafficLog" useGeneratedKeys="true" keyProperty="logId">

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

@@ -36,6 +36,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsUserCourseCategoryVo"/>
         where cate_id = #{cateId}
     </select>
+    <select id="selectFsUserCourseCategoryPidList" resultType="com.fs.his.vo.OptionsVO">
+        select cate_id dict_value, cate_name dict_label  from fs_user_course_category WHERE pid = 0 and is_del=0
+        <if test="isShow != null">
+            and is_show = #{isShow}
+        </if>
+    </select>
 
     <insert id="insertFsUserCourseCategory" parameterType="FsUserCourseCategory" useGeneratedKeys="true" keyProperty="cateId">
         insert into fs_user_course_category

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

@@ -233,12 +233,6 @@
             <if test="listingEndTime != null">listing_end_time = #{listingEndTime},</if>
             <if test="projectId != null">project_id = #{projectId},</if>
             <if test="isFirst != null">is_first = #{isFirst},</if>
-            <if test="tagGroupId != null">tag_group_id = #{tagGroupId},</if>
-            <if test="watchingTagId != null">watching_tag_id = #{watchingTagId},</if>
-            <if test="watchedTagId != null">watched_tag_id = #{watchedTagId},</if>
-            <if test="tgId != null">tg_id = #{tgId},</if>
-            <if test="watchingTgId != null">watching_tg_id = #{watchingTgId},</if>
-            <if test="watchedTgId != null">watched_tg_id = #{watchedTgId},</if>
         </trim>
         where video_id = #{videoId}
     </update>

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

@@ -624,12 +624,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="userCode != null">user_code = #{userCode},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="level != null">level = #{level},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="lastIp != null">last_ip = #{lastIp},</if>
             <if test="balance != null">balance = #{balance},</if>
             <if test="integralStatus != null">integral_status = #{integralStatus},</if>
             <if test="isBuy != null">is_buy = #{isBuy},</if>
+            <if test="isShow != null">is_show = #{isShow},</if>
             <if test="password != null">password = #{password},</if>
             <if test="jpushId != null">jpush_id = #{jpushId},</if>
             <if test="isVip != null">is_vip = #{isVip},</if>

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1003,8 +1003,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1
         LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1159,7 +1159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="maps.erpAccount != null and  maps.erpAccount != ''">
             LEFT JOIN fs_store_order_df df on df.order_id==o.id
         </if>
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1169,8 +1169,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1301,7 +1301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join fs_store_order_item_scrm oi on o.id = oi.order_id
             left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
         </if>
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1312,8 +1312,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1424,6 +1424,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maps.erpAccount == '未分拣'">
                 and ( df.login_account is null or df.login_account like '')
             </if>
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
+            </if>
 
         </where>
         ${maps.params.dataScope}
@@ -1442,7 +1445,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN fs_user us ON us.user_id=o.user_id
         LEFT JOIN company_user cu on cu.user_id=o.company_user_id
         LEFT JOIN fs_store_order_df df on df.order_id=o.id
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1453,8 +1456,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         </if>
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1593,8 +1596,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) sp_latest ON sp_latest.business_code = o.order_code AND sp_latest.rn = 1
         LEFT JOIN fs_course_play_source_config csc ON csc.appid = sp_latest.app_id
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCodes != null  and maps.orderCodes.size > 0">
                 and o.order_code in
@@ -1742,7 +1745,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join fs_store_order_item_scrm oi on o.id = oi.order_id
             left join fs_store_product_scrm fsp on fsp.product_id = oi.product_id
         </if>
-        <if test="maps.coursePlaySourceConfigId != null">
+        <if test="maps.appId != null and maps.appId != ''">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1754,8 +1757,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
 
         <where>
-            <if test="maps.coursePlaySourceConfigId != null">
-                and csc.id = #{maps.coursePlaySourceConfigId}
+            <if test="maps.appId != null and map.appId != ''">
+                and csc.appid = #{maps.appId}
             </if>
             <if test="maps.orderCode != null and  maps.orderCode !=''">
                 and o.order_code like CONCAT('%',#{maps.orderCode},'%')
@@ -1852,6 +1855,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maps.erpPhoneNumber != null and maps.erpPhoneNumber != ''">
                 and so.erp_phone like concat(#{maps.erpPhoneNumber},'%')
             </if>
+            <if test="maps.appId != null and maps.appId != ''">
+                and csc.appid = #{maps.appId}
+            </if>
         </where>
         ${maps.params.dataScope}
         <if test="maps.productName != null and  maps.productName !=  ''   ">

fs-service/src/main/resources/mapper/hisStore/FsStorePaymentScrmMapper.xml

@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderId"    column="order_id"    />
         <result property="isPayRemain"    column="is_pay_remain"    />
         <result property="payMode"    column="pay_mode"    />
+        <result property="businessCode"    column="business_code"    />
     </resultMap>
 
     <sql id="selectFsStorePaymentVo">
-        select payment_id,pay_mode, pay_code, pay_type_code, pay_money, pay_time, create_time, trade_no, user_id, open_id, business_type, business_order_id, status,remark,company_id,company_user_id,dept_id,bank_transaction_id,bank_serial_no,refund_money,refund_time,order_id,is_pay_remain from fs_store_payment_scrm
+        select payment_id,pay_mode, pay_code, pay_type_code, pay_money, pay_time, create_time, trade_no, user_id, open_id, business_type, business_order_id, status,remark,company_id,company_user_id,dept_id,bank_transaction_id,bank_serial_no,refund_money,refund_time,order_id,is_pay_remain,business_code from fs_store_payment_scrm
 
     </sql>
 
@@ -55,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankTransactionId != null "> and bank_transaction_id = #{bankTransactionId}</if>
             <if test="bankSerialNo != null "> and bank_serial_no = #{bankSerialNo}</if>
             <if test="orderId != null "> and order_id = #{orderId}</if>
+            <if test="businessCode != null and businessCode != ''"> and business_code = #{businessCode}</if>
         </where>
     </select>
 
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPayRemain != null">is_pay_remain,</if>
             <if test="payMode != null">pay_mode,</if>
             <if test="appId != null">app_id,</if>
+            <if test="businessCode != null">business_code,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="payCode != null">#{payCode},</if>
@@ -114,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPayRemain != null">#{isPayRemain},</if>
             <if test="payMode != null">#{payMode},</if>
             <if test="appId != null">#{appId},</if>
+            <if test="businessCode != null">#{businessCode},</if>
         </trim>
     </insert>
 
@@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isPayRemain != null">is_pay_remain = #{isPayRemain},</if>
             <if test="payMode != null">pay_mode = #{payMode},</if>
             <if test="appId != null">app_id = #{appId},</if>
+            <if test="businessCode != null and businessCode != ''">business_code = #{businessCode},</if>
         </trim>
         where payment_id = #{paymentId}
     </update>

fs-service/src/main/resources/mapper/hisStore/FsStoreProductCategoryScrmMapper.xml

@@ -38,6 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsStoreProductCategoryVo"/>
         where cate_id = #{cateId}
     </select>
+    <select id="selectCateIdsByName" resultType="java.lang.Long">
+        select cate_id from fs_store_product_category_scrm where pid in (
+        select cate_id from fs_store_product_category_scrm where cate_name = #{cateName} and pid=0
+        )
+
+    </select>
 
     <insert id="insertFsStoreProductCategory" parameterType="FsStoreProductCategoryScrm" useGeneratedKeys="true" keyProperty="cateId">
         insert into fs_store_product_category_scrm

fs-service/src/main/resources/mapper/hisStore/FsStoreProductScrmMapper.xml

@@ -92,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                p.unit_price,p.batch_number,p.mah,p.mah_address,p.manufacturer,p.manufacturer_address,p.indications,p.dosage,
                p.adverse_reactions,p.contraindications,p.precautions,p.is_audit,p.store_id
         from fs_store_product_scrm p
-        select product_id, video, image, slider_image, product_name, product_info, keyword, bar_code, cate_id, price, vip_price, ot_price, agent_price, postage, unit_name, sort, sales, stock, is_show, is_hot, is_benefit, is_best, is_new, description, create_time, update_time, is_postage, is_del, give_integral, cost, is_good, browse, code_path, temp_id, spec_type, is_integral, integral, product_type, prescribe_code, prescribe_spec, prescribe_factory, prescribe_name, is_display, tui_cate_id, company_ids, store_id, is_drug, drug_image, drug_reg_cert_no, common_name, dosage_form, unit_price, batch_number, mah, mah_address, manufacturer, manufacturer_address, indications, dosage, adverse_reactions, contraindications, precautions, is_audit from fs_store_product_scrm
     </sql>
 
     <select id="selectFsStoreProductByProductId" parameterType="Long" resultMap="FsStoreProductResult">

fs-service/src/main/resources/mapper/sop/QwSopMapper.xml

@@ -294,6 +294,7 @@
             <if test="data.autoGroup != null">auto_group,</if>
             <if test="data.autoGroupLevel != null">auto_group_level,</if>
             <if test="data.groupName != null">group_name,</if>
+            <if test="data.isFixed != null">is_fixed,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="data.name != null">#{data.name},</if>
@@ -326,6 +327,7 @@
             <if test="data.autoGroup != null">#{data.autoGroup},</if>
             <if test="data.autoGroupLevel != null">#{data.autoGroupLevel},</if>
             <if test="data.groupName != null">#{data.groupName},</if>
+            <if test="data.isFixed != null">#{data.isFixed},</if>
         </trim>
     </insert>
 
@@ -505,6 +507,7 @@
             <if test="data.autoGroup != null">auto_group = #{data.autoGroup},</if>
             <if test="data.autoGroupLevel != null">auto_group_level = #{data.autoGroupLevel},</if>
             <if test="data.groupName != null">group_name = #{data.groupName},</if>
+            <if test="data.isFixed != null">is_fixed = #{data.isFixed},</if>
         </trim>
         where id = #{data.id}
     </update>

fs-service/src/main/resources/mapper/statis/ConsumptionBalanceMapper.xml

@@ -168,14 +168,16 @@
     </select>
     <select id="watchEndPlayTrend" resultType="com.fs.statis.dto.WatchEndPlayTrendDTO">
         SELECT
---             今日/昨日 小时
-            <if test="type == 0 or type == 1">
+        <choose>
+            <!-- 按小时分组 -->
+            <when test="type == 0 or type == 1">
                 DATE_FORMAT(create_time, '%H') AS start_date,
-            </if>
---                 本周/本月/上月 天
-            <if test="type == 2 or type == 3 or type == 4">
+            </when>
+            <!-- 按天分组 -->
+            <when test="type == 2 or type == 3 or type == 4">
                 DATE_FORMAT(create_time, '%Y-%m-%d') AS start_date,
-            </if>
+            </when>
+        </choose>
         COUNT(DISTINCT user_id) AS watch_user_count,
         COUNT(DISTINCT CASE WHEN log_type = 2 THEN user_id END) AS completed_user_count
         FROM
@@ -192,7 +194,10 @@
             </if>
         </where>
         GROUP BY
-        start_date
+        <choose>
+            <when test="type == 0 or type == 1">DATE_FORMAT(create_time, '%H')</when>
+            <when test="type == 2 or type == 3 or type == 4">DATE_FORMAT(create_time, '%Y-%m-%d')</when>
+        </choose>
         ORDER BY
         start_date
     </select>
@@ -224,50 +229,177 @@
         GROUP BY company_id
         limit 10
     </select>
-    <select id="watchCourseTopTen" resultType="com.fs.statis.dto.CourseStatsDTO">
+<!--    <select id="watchCourseTopTen" resultType="com.fs.statis.dto.CourseStatsDTO">-->
+<!--        SELECT-->
+<!--        w.course_id AS course_id,-->
+<!--        COUNT(DISTINCT w.user_id) AS watch_user_count,-->
+<!--        COUNT(DISTINCT CASE WHEN w.log_type = 2 THEN w.user_id END) AS completed_user_count,-->
+<!--        COUNT(DISTINCT a.user_id) AS answer_user_count,-->
+<!--        COUNT(DISTINCT CASE WHEN a.is_right = 1 THEN a.user_id END) AS correct_user_count-->
+<!--        FROM-->
+<!--        fs_course_watch_log w-->
+<!--        LEFT JOIN-->
+<!--        fs_course_answer_logs a ON w.video_id = a.video_id AND w.user_id = a.user_id-->
+<!--        <where>-->
+<!--            <if test="startTime != null">-->
+<!--                w.create_time <![CDATA[>=]]> #{startTime}-->
+<!--            </if>-->
+<!--            <if test="endTime != null">-->
+<!--                AND w.create_time <![CDATA[<]]> #{endTime}-->
+<!--            </if>-->
+<!--            <if test="userType != null">-->
+<!--                AND send_type = ${userType}-->
+<!--            </if>-->
+<!--            <if test="companyId != null">-->
+<!--                AND w.company_id = ${companyId}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        GROUP BY-->
+<!--        w.course_id-->
+<!--        ORDER BY-->
+<!--            &#45;&#45; 观看人数-->
+<!--            <if test="statisticalType == 0">-->
+<!--                COUNT(DISTINCT w.user_id)-->
+<!--            </if>-->
+<!--            <if test="statisticalType == 1">-->
+<!--                COUNT(DISTINCT CASE WHEN w.log_type = 2 THEN w.user_id END)-->
+<!--            </if>-->
+<!--            <if test="statisticalType == 2">-->
+<!--                COUNT(DISTINCT a.user_id)-->
+<!--            </if>-->
+<!--            <if test="statisticalType == 3">-->
+<!--                COUNT(DISTINCT CASE WHEN a.is_right = 1 THEN a.user_id END)-->
+<!--            </if>-->
+<!--        ${sort}-->
+<!--        LIMIT 10-->
+<!--    </select>-->
+
+    <!-- 1. 按观看人数排序 -->
+    <select id="watchCourseTopTenByWatch" resultType="com.fs.statis.dto.CourseStatsDTO">
+        SELECT
+        course_id AS courseId,
+        COUNT(DISTINCT user_id) AS watch_user_count,
+        COUNT(DISTINCT CASE WHEN log_type = 2 THEN user_id END) AS completed_user_count,
+        0 AS answer_user_count,
+        0 AS correct_user_count
+        FROM fs_course_watch_log
+        <where>
+            <if test="startTime != null">create_time <![CDATA[>=]]> #{startTime}</if>
+            <if test="endTime != null">AND create_time <![CDATA[<]]> #{endTime}</if>
+            <if test="userType != null">AND send_type = #{userType}</if>
+            <if test="companyId != null">AND company_id = #{companyId}</if>
+        </where>
+        GROUP BY course_id
+        ORDER BY watch_user_count
+        <choose>
+            <when test="sort != null and sort == 'DESC'">DESC</when>
+            <otherwise>ASC</otherwise>
+        </choose>
+        LIMIT 10
+    </select>
+
+    <!-- 2. 按完成人数排序 -->
+    <select id="watchCourseTopTenByComplete" resultType="com.fs.statis.dto.CourseStatsDTO">
         SELECT
-        w.course_id AS course_id,
+        course_id AS courseId,
+        COUNT(DISTINCT user_id) AS watch_user_count,
+        COUNT(DISTINCT CASE WHEN log_type = 2 THEN user_id END) AS completed_user_count,
+        0 AS answer_user_count,
+        0 AS correct_user_count
+        FROM fs_course_watch_log
+        <where>
+            <if test="startTime != null">create_time <![CDATA[>=]]> #{startTime}</if>
+            <if test="endTime != null">AND create_time <![CDATA[<]]> #{endTime}</if>
+            <if test="userType != null">AND send_type = #{userType}</if>
+            <if test="companyId != null">AND company_id = #{companyId}</if>
+        </where>
+        GROUP BY course_id
+        ORDER BY completed_user_count
+        <choose>
+            <when test="sort != null and sort == 'DESC'">DESC</when>
+            <otherwise>ASC</otherwise>
+        </choose>
+        LIMIT 10
+    </select>
+
+    <!-- 3. 按答题人数排序 -->
+    <select id="watchCourseTopTenByAnswer" resultType="com.fs.statis.dto.CourseStatsDTO">
+        SELECT
+        w.course_id AS courseId,
         COUNT(DISTINCT w.user_id) AS watch_user_count,
         COUNT(DISTINCT CASE WHEN w.log_type = 2 THEN w.user_id END) AS completed_user_count,
         COUNT(DISTINCT a.user_id) AS answer_user_count,
         COUNT(DISTINCT CASE WHEN a.is_right = 1 THEN a.user_id END) AS correct_user_count
-        FROM
-        fs_course_watch_log w
-        LEFT JOIN
-        fs_course_answer_logs a ON w.video_id = a.video_id AND w.user_id = a.user_id
+        FROM fs_course_watch_log w
+        LEFT JOIN fs_course_answer_logs a ON w.video_id = a.video_id AND w.user_id = a.user_id
         <where>
-            <if test="startTime != null">
-                w.create_time <![CDATA[>=]]> #{startTime}
-            </if>
-            <if test="endTime != null">
-                AND w.create_time <![CDATA[<]]> #{endTime}
-            </if>
-            <if test="userType != null">
-                AND send_type = ${userType}
-            </if>
-            <if test="companyId != null">
-                AND w.company_id = ${companyId}
-            </if>
+            <if test="startTime != null">w.create_time <![CDATA[>=]]> #{startTime}</if>
+            <if test="endTime != null">AND w.create_time <![CDATA[<]]> #{endTime}</if>
+            <if test="userType != null">AND w.send_type = #{userType}</if>
+            <if test="companyId != null">AND w.company_id = #{companyId}</if>
+<!--            <if test="startTime != null">AND a.create_time <![CDATA[>=]]> #{startTime}</if> -->
+<!--            <if test="endTime != null">AND a.create_time <![CDATA[<]]> #{endTime}</if> -->
         </where>
-        GROUP BY
-        w.course_id
-        ORDER BY
-            -- 观看人数
-            <if test="statisticalType == 0">
-                COUNT(DISTINCT w.user_id)
-            </if>
-            <if test="statisticalType == 1">
-                COUNT(DISTINCT CASE WHEN w.log_type = 2 THEN w.user_id END)
-            </if>
-            <if test="statisticalType == 2">
-                COUNT(DISTINCT a.user_id)
-            </if>
-            <if test="statisticalType == 3">
-                COUNT(DISTINCT CASE WHEN a.is_right = 1 THEN a.user_id END)
-            </if>
-        ${sort}
+        GROUP BY w.course_id
+        ORDER BY answer_user_count
+        <choose>
+            <when test="sort != null and sort == 'DESC'">DESC</when>
+            <otherwise>ASC</otherwise>
+        </choose>
+        LIMIT 10
+    </select>
+
+    <!-- 4. 按正确人数排序 -->
+    <select id="watchCourseTopTenByCorrect" resultType="com.fs.statis.dto.CourseStatsDTO">
+        SELECT
+        w.course_id AS courseId,
+        COUNT(DISTINCT w.user_id) AS watch_user_count,
+        COUNT(DISTINCT CASE WHEN w.log_type = 2 THEN w.user_id END) AS completed_user_count,
+        COUNT(DISTINCT a.user_id) AS answer_user_count,
+        COUNT(DISTINCT CASE WHEN a.is_right = 1 THEN a.user_id END) AS correct_user_count
+        FROM fs_course_watch_log w
+        LEFT JOIN fs_course_answer_logs a ON w.video_id = a.video_id AND w.user_id = a.user_id
+        <where>
+            <if test="startTime != null">w.create_time <![CDATA[>=]]> #{startTime}</if>
+            <if test="endTime != null">AND w.create_time <![CDATA[<]]> #{endTime}</if>
+            <if test="userType != null">AND w.send_type = #{userType}</if>
+            <if test="companyId != null">AND w.company_id = #{companyId}</if>
+            <if test="startTime != null">AND a.create_time <![CDATA[>=]]> #{startTime}</if>
+            <if test="endTime != null">AND a.create_time <![CDATA[<]]> #{endTime}</if>
+        </where>
+        GROUP BY w.course_id
+        ORDER BY correct_user_count
+        <choose>
+            <when test="sort != null and sort == 'DESC'">DESC</when>
+            <otherwise>ASC</otherwise>
+        </choose>
         LIMIT 10
     </select>
+
+    <!-- 5. 批量补充答题数据 -->
+    <select id="getAnswerStatsByCourseIds" resultType="com.fs.statis.dto.CourseStatsDTO">
+        SELECT
+        w.course_id AS courseId,
+        COUNT(DISTINCT a.user_id) AS answer_user_count,
+        COUNT(DISTINCT CASE WHEN a.is_right = 1 THEN a.user_id END) AS correct_user_count
+        FROM fs_course_answer_logs a
+        INNER JOIN fs_course_watch_log w ON a.video_id = w.video_id AND a.user_id = w.user_id
+        <where>
+            w.course_id IN
+            <foreach collection="courseIds" item="courseId" open="(" close=")" separator=",">
+                #{courseId}
+            </foreach>
+            <if test="param.startTime != null">AND w.create_time <![CDATA[>=]]> #{param.startTime}</if>
+            <if test="param.endTime != null">AND w.create_time <![CDATA[<]]> #{param.endTime}</if>
+            <if test="param.userType != null">AND w.send_type = #{param.userType}</if>
+            <if test="param.companyId != null">AND w.company_id = #{param.companyId}</if>
+            <if test="param.startTime != null">AND a.create_time <![CDATA[>=]]> #{param.startTime}</if>
+            <if test="param.endTime != null">AND a.create_time <![CDATA[<]]> #{param.endTime}</if>
+        </where>
+        GROUP BY w.course_id
+    </select>
+
+
     <select id="rewardMoneyTopTen" resultType="com.fs.statis.dto.RewardMoneyTopTenDTO">
         SELECT
             -- 按公司

fs-user-app/src/main/java/com/fs/app/controller/CourseController.java

@@ -54,9 +54,9 @@ public class CourseController extends  AppBaseController{
 //    @Cacheable(value="getCourseCate" )
     @ApiOperation("获取分类")
     @GetMapping("/getCourseCate")
-    public R getCourseCate(){
+    public R getCourseCate(@RequestParam(value = "isShow",required = false) Integer isShow){
         try {
-            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList();
+            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList(isShow);
             return R.ok().put("data",list);
         } catch (Exception e){
             return R.error("操作异常");

fs-user-app/src/main/java/com/fs/app/controller/store/CourseScrmController.java

@@ -89,7 +89,8 @@ public class CourseScrmController extends AppBaseController {
     @GetMapping("/getCourseCate")
     public R getCourseCate(){
         try {
-            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList();
+            Integer isShow = null;
+            List<OptionsVO> list = courseCategoryService.selectFsUserCourseCategoryPidList(isShow);
             return R.ok().put("data",list);
         } catch (Exception e){
             return R.error("操作异常");

fs-user-app/src/main/java/com/fs/app/controller/store/WxUserScrmController.java

@@ -267,7 +267,11 @@ public class WxUserScrmController extends AppBaseController {
         logger.info("appid"+param.getCode());
         logger.info("appid"+param.getAppId());
         if(StringUtils.isNotEmpty(param.getAppId())){
-            courseMa_appId = configUtil.generateConfigMiniByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey(),param.getAppId()).getString("appid");
+            try {
+                courseMa_appId = configUtil.generateConfigMiniByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey(),param.getAppId()).getString("appid");
+            } catch (Exception e) {
+                courseMa_appId = param.getAppId();
+            }
         }else{
             courseMa_appId = configUtil.generateConfigByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey()).getString("appid");
         }