Merge branch 'master' into 康年堂

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

@@ -3,6 +3,7 @@ package com.fs.course.controller;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
@@ -10,6 +11,8 @@ import com.fs.course.domain.FsCourseAnswerLogs;
 import com.fs.course.param.FsCourseAnswerLogsParam;
 import com.fs.course.service.IFsCourseAnswerLogsService;
 import com.fs.course.vo.FsCourseAnswerLogsListVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -35,17 +38,26 @@ public class FsCourseAnswerLogsController extends BaseController
      * 查询答题日志列表
      */
     @PreAuthorize("@ss.hasPermi('course:courseAnswerLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseAnswerLogsParam param)
+    @PostMapping("/list")
+    public R list(@RequestBody  FsCourseAnswerLogsParam param)
     {
-        startPage();
+        if(param.getPageNum() == null) {
+            param.setPageNum(1);
+        }
+        if(param.getPageSize() == null) {
+            param.setPageSize(10);
+        }
 
         if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
             param.setPhone(encryptPhone(param.getPhoneMk()));
         }
 
+
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
         List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
-        return getDataTable(list);
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -53,8 +65,8 @@ public class FsCourseAnswerLogsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseAnswerLog:export')")
     @Log(title = "答题日志", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseAnswerLogsParam param)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FsCourseAnswerLogsParam param)
     {
         if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
             param.setPhone(encryptPhone(param.getPhoneMk()));

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

@@ -17,6 +17,8 @@ import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,21 +64,28 @@ public class FsCourseRedPacketLogController extends BaseController
      * 查询短链课程看课记录列表
      */
     @PreAuthorize("@ss.hasPermi('course:courseRedPacketLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseRedPacketLogParam fsCourseRedPacketLog)
+    @PostMapping("/list")
+    public R list(@RequestBody FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
-        startPage();
+        if(fsCourseRedPacketLog.getPageNum() == null) {
+            fsCourseRedPacketLog.setPageNum(1);
+        }
+        if(fsCourseRedPacketLog.getPageSize() == null) {
+            fsCourseRedPacketLog.setPageSize(10);
+        }
+
 
         if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
             fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
         }
+        PageHelper.startPage(fsCourseRedPacketLog.getPageNum(), fsCourseRedPacketLog.getPageSize());
 
         List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
         for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
 
             fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
         }
-        return getDataTable(list);
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -84,8 +93,8 @@ public class FsCourseRedPacketLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseRedPacketLog:export')")
     @Log(title = "短链课程看课记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseRedPacketLogParam fsCourseRedPacketLog)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
         if (fsCourseRedPacketLog.getPhoneMk()!=null&&fsCourseRedPacketLog.getPhoneMk()!=""){
             fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fs.common.constant.HttpStatus;
+import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.ServletUtils;
 import com.fs.course.param.FsCourseOverParam;
@@ -14,6 +15,8 @@ import com.fs.course.vo.FsCourseWatchLogListVO;
 import com.fs.course.vo.FsCourseWatchLogStatisticsListVO;
 import com.fs.qw.param.QwWatchLogStatisticsListParam;
 import com.fs.qw.service.IQwWatchLogService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,12 +55,20 @@ public class FsCourseWatchLogController extends BaseController
      * 查询短链课程看课记录列表
      */
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseWatchLogListParam param)
+    @PostMapping("/list")
+    public R list(@RequestBody FsCourseWatchLogListParam param)
     {
-        startPage();
+        if(param.getPageNum() == null) {
+            param.setPageNum(1);
+        }
+        if(param.getPageSize() == null) {
+            param.setPageSize(10);
+        }
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        return getDataTable(list);
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     @GetMapping("/qwWatchLogAllStatisticsList")
@@ -114,8 +125,8 @@ public class FsCourseWatchLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:export')")
     @Log(title = "短链课程看课记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseWatchLogListParam param)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FsCourseWatchLogListParam param)
     {
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
         ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);

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

@@ -7,6 +7,8 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.entity.SysRole;
+import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.CloudHostUtils;
@@ -22,6 +24,7 @@ import com.fs.his.param.BatchSetErpOrderParam;
 import com.fs.his.vo.*;
 import com.fs.his.param.FsIntegralOrderParam;
 import com.fs.his.service.*;
+import com.fs.system.service.ISysRoleService;
 import com.fs.utils.OrderContextHolder;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +32,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import lombok.extern.slf4j.Slf4j;
 
 import java.text.ParseException;
 import java.time.LocalDateTime;
@@ -45,6 +49,7 @@ import static com.fs.his.utils.PhoneUtil.decryptPhone;
  * @author fs
  * @date 2023-11-02
  */
+@Slf4j
 @RestController
 @RequestMapping("/his/integralOrder")
 public class FsIntegralOrderController extends BaseController
@@ -78,44 +83,118 @@ public class FsIntegralOrderController extends BaseController
     public TableDataInfo list(FsIntegralOrderParam fsIntegralOrder)
     {
         startPage();
+        List<FsIntegralOrderListVO> list = new ArrayList<>();
         if (CloudHostUtils.hasCloudHostName("金牛明医")){
             /*目前只有金牛有状态为6的查询，其他项目避免使用6状态码*/
             if (fsIntegralOrder.getStatus() != null && fsIntegralOrder.getStatus().equals("6")) {
                 fsIntegralOrder.setStatus("1");
                 fsIntegralOrder.setIsPush(0);
             }
-            List<FsIntegralOrderListVO> list = fsIntegralOrderService.selectFsIntegralOrderListByJn(fsIntegralOrder);
+
+            // 金牛明医项目：支持多个订单ID查询
+//            if (fsIntegralOrder.getOrderCodes() != null && !fsIntegralOrder.getOrderCodes().isEmpty()) {
+//                // 如果传了orderIds参数，使用新的查询逻辑
+//                List<FsIntegralOrder> orders = fsIntegralOrderService.selectFsIntegralOrderByOrderIdsv2(fsIntegralOrder.getOrderCodes());
+//                List<FsIntegralOrderListVO> list = orders.stream()
+//                    .map(this::convertOrderToListVO)
+//                    .collect(Collectors.toList());
+//                for (FsIntegralOrderListVO vo : list) {
+//                    vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
+//                }
+//                return getDataTable(list);
+//            } else {
+//                // 原有逻辑：单个orderId或其他条件查询
+//                List<FsIntegralOrderListVO> list = fsIntegralOrderService.selectFsIntegralOrderListByJn(fsIntegralOrder);
+//                for (FsIntegralOrderListVO vo : list) {
+//                    vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
+//                }
+//                return getDataTable(list);
+//            }
+            list = fsIntegralOrderService.selectFsIntegralOrderListByJn(fsIntegralOrder);
+        } else {
+            list = fsIntegralOrderService.selectFsIntegralOrderListVO(fsIntegralOrder);
+        }
+        SysRole sysRole = isCheckPermission();
+        if (sysRole != null && !(sysRole.getIsCheckPhone()==1)) {
             for (FsIntegralOrderListVO vo : list) {
                 vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
             }
-            return getDataTable(list);
-        }
-        List<FsIntegralOrderListVO> list = fsIntegralOrderService.selectFsIntegralOrderListVO(fsIntegralOrder);
-        for (FsIntegralOrderListVO vo : list) {
-            vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
         }
         return getDataTable(list);
     }
 
+    @Autowired
+    private ISysRoleService sysRoleService;
+    private SysRole isCheckPermission() {
+        SysRole sysRole = new SysRole();
+        SysUser user = getLoginUser().getUser();
+        boolean flag = user.isAdmin();
+        if (flag) {
+            sysRole.setIsCheckPhone(1);
+            sysRole.setIsCheckAddress(1);
+        } else {
+            List<SysRole> roles = user.getRoles();
+            if (roles != null && !roles.isEmpty()) {
+                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
+                return sysRoleService.getIsCheckPermission(roleIds);
+            }
+        }
+        return sysRole;
+    }
+
     /**
      * 导出积分商品订单列表
      */
     @PreAuthorize("@ss.hasPermi('his:integralOrder:export')")
     @Log(title = "积分商品订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(FsIntegralOrder fsIntegralOrder)
-    {
-        if (CloudHostUtils.hasCloudHostName("金牛明医")&&fsIntegralOrder.getStatus() != null && fsIntegralOrder.getStatus().equals(6)) {
+    public AjaxResult export(FsIntegralOrderParam fsIntegralOrder) {
+        List<FsIntegralOrderListVO> fsIntegralOrderListVOS = new ArrayList<>();
+        if (CloudHostUtils.hasCloudHostName("金牛明医")){
             /*目前只有金牛有状态为6的查询，其他项目避免使用6状态码*/
-            FsIntegralOrderParam param = new FsIntegralOrderParam();
-            BeanUtil.copyProperties(fsIntegralOrder, param);
-            param.setStatus("1");
-            param.setIsPush(0);
-            List<FsIntegralOrderListVO> fsIntegralOrderListVOS = fsIntegralOrderService.selectFsIntegralOrderListByJn(param);
-            ExcelUtil<FsIntegralOrderListVO> util = new ExcelUtil<>(FsIntegralOrderListVO.class);
-            return util.exportExcel(new ArrayList<>(fsIntegralOrderListVOS), "积分商品订单数据");
+            if (fsIntegralOrder.getStatus() != null && fsIntegralOrder.getStatus().equals("6")) {
+                fsIntegralOrder.setStatus("1");
+                fsIntegralOrder.setIsPush(0);
+            }
+            fsIntegralOrderListVOS = fsIntegralOrderService.selectFsIntegralOrderListByJn(fsIntegralOrder);
+        } else {
+            fsIntegralOrderListVOS = fsIntegralOrderService.selectFsIntegralOrderListVO(fsIntegralOrder);
+        }
+        SysRole sysRole = isCheckPermission();
+        // 处理商品名称：解析item_json并设置goodsName
+        for (FsIntegralOrderListVO vo : fsIntegralOrderListVOS) {
+            if (StringUtils.isNotEmpty(vo.getItemJson())) {
+                try {
+                    // 尝试解析JSON格式的商品信息
+                    if (vo.getItemJson().startsWith("[")) {
+                        // 数组格式，取第一个商品
+                        com.alibaba.fastjson.JSONArray jsonArray = com.alibaba.fastjson.JSONArray.parseArray(vo.getItemJson());
+                        if (jsonArray != null && !jsonArray.isEmpty()) {
+                            com.alibaba.fastjson.JSONObject goods = jsonArray.getJSONObject(0);
+                            if (goods != null && goods.getString("goodsName") != null) {
+                                vo.setGoodsName(goods.getString("goodsName"));
+                            }
+                        }
+                    } else if (vo.getItemJson().startsWith("{")) {
+                        // 对象格式
+                        com.alibaba.fastjson.JSONObject goods = com.alibaba.fastjson.JSONObject.parseObject(vo.getItemJson());
+                        if (goods != null && goods.getString("goodsName") != null) {
+                            vo.setGoodsName(goods.getString("goodsName"));
+                        }
+                    }
+                } catch (Exception e) {
+                    // 解析失败时保持goodsName为空，避免导出出错
+                    log.warn("解析商品信息失败，订单编号：{}, 商品信息：{}", vo.getOrderCode(), vo.getItemJson());
+                }
+            }
+            if (!(sysRole.getIsCheckPhone()==1)){
+                // 加密手机号
+                vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
+            }
+
         }
-        return fsIntegralOrderService.export(fsIntegralOrder);
+        ExcelUtil<FsIntegralOrderListVO> util = new ExcelUtil<>(FsIntegralOrderListVO.class);
+        return util.exportExcel(new ArrayList<>(fsIntegralOrderListVOS), "积分商品订单数据");
     }
     /**
      * 发货

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

@@ -3,6 +3,7 @@ package com.fs.his.task;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -33,12 +34,10 @@ import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.dto.ErpOrderResponse;
 import com.fs.erp.mapper.FsErpFinishPushMapper;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.fastGpt.domain.FastGptEventTokenLog;
-import com.fs.fastGpt.domain.FastGptPushTokenTotal;
-import com.fs.fastGpt.domain.FastgptChatVoiceHomo;
-import com.fs.fastGpt.domain.FastgptEventLogTotal;
+import com.fs.fastGpt.domain.*;
 import com.fs.fastGpt.mapper.FastGptChatSessionMapper;
 import com.fs.fastGpt.mapper.FastgptChatVoiceHomoMapper;
+import com.fs.fastGpt.service.AiHookService;
 import com.fs.fastGpt.service.IFastgptEventLogTotalService;
 import com.fs.fastgptApi.util.AudioUtils;
 import com.fs.fastgptApi.vo.AudioVO;
@@ -67,7 +66,9 @@ import com.fs.im.dto.*;
 import com.fs.im.service.IImService;
 import com.fs.im.service.OpenIMService;
 import com.fs.qw.domain.QwCompany;
+import com.fs.qw.domain.QwUser;
 import com.fs.qw.mapper.QwRestrictionPushRecordMapper;
+import com.fs.qw.mapper.QwUserMapper;
 import com.fs.qw.service.*;
 import com.fs.qwApi.service.QwApiService;
 import com.fs.sop.domain.QwSopTempVoice;
@@ -225,6 +226,46 @@ public class Task {
     @Autowired
     private FsIntegralOrderMapper fsIntegralOrderMapper;
 
+    private final String DELAY_MSG = "delayMsg";
+
+    @Autowired
+    private QwUserMapper qwUserMapper;
+
+    @Autowired
+    private AiHookService aiHookService;
+
+
+    /**
+     * 定时任务，处理ai禁止回复之后的消息
+     */
+    public void forbidTimeMsgTask() {
+        Map<String, Object> cacheMap = redisCache.hGetAll(DELAY_MSG);
+        for (String key : cacheMap.keySet()) {
+            String value = (String) cacheMap.get(key);
+            //获取sessionId
+            Long sessionId = Long.parseLong(key);
+            try {
+                if (value != null && !value.isEmpty()) {
+                    FastGptChatSession chatSession = fastGptChatSessionMapper.selectFastGptChatSessionBySessionId(sessionId);
+                    Long qwUserId = chatSession.getQwUserId();
+                    QwUser qwUser = qwUserMapper.selectQwUserById(qwUserId);
+                    String uid = qwUser.getUid();
+
+                    JSONObject jsonObject = JSONObject.parseObject(value);
+                    String content = jsonObject.getString("content");
+                    Long sender = jsonObject.getLong("sender");
+                    Integer type = jsonObject.getInteger("type");
+
+                    aiHookService.qwHookNotifyAiReply(qwUserId,sender,content,uid,type);
+                    //删除已经处理的缓存
+                    redisCache.hDel(DELAY_MSG,key);
+                }
+            } catch (Exception e) {
+                log.error("个人定时消息处理异常,会话id：{},文本：{}",sessionId,value,e);
+            }
+        }
+    }
+
     /**
      * sop任务token消耗统计
      */

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreAfterSalesScrmController.java

@@ -133,6 +133,9 @@ public class FsStoreAfterSalesScrmController extends BaseController
 //                            zmvo.setAfterSalesNumber
                             zmvo.setRefundMoney(vo.getRefundAmount());
                             zmvo.setBankTransactionId(vo.getBankTransactionId());
+                            zmvo.setReasons(vo.getReasons());
+                            zmvo.setExplains(vo.getExplains());
+
                         } catch (Exception e) {
                             // 处理异常
                             e.printStackTrace();

fs-admin/src/main/java/com/fs/hisStore/task/LiveTask.java

@@ -12,6 +12,7 @@ import com.fs.erp.domain.ErpDeliverys;
 import com.fs.erp.domain.ErpOrderQuery;
 import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
+import com.fs.erp.service.FsJstAftersalePushScrmService;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.dto.ExpressInfoDTO;
@@ -160,6 +161,14 @@ public class LiveTask {
     @Autowired
     private IFsStoreOrderScrmService orderService;
 
+    @Autowired
+    private FsJstAftersalePushScrmService fsJstAftersalePushScrmService;
+
+    // 聚水潭 推送售后信息
+    public void pushJst(){
+        fsJstAftersalePushScrmService.pushJst();
+    }
+
 
     // 订单银行回调数据丢失补偿
     public void recoveryBankOrder() {

fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesController.java

@@ -143,6 +143,8 @@ public class LiveAfterSalesController extends BaseController
 //                            zmvo.setAfterSalesNumber
                             zmvo.setRefundMoney(vo.getRefundAmount());
                             zmvo.setBankTransactionId(vo.getBankTransactionId());
+                            zmvo.setReasons(vo.getReasons());
+                            zmvo.setExplains(vo.getExplains());
                         } catch (Exception e) {
                             // 处理异常
                             e.printStackTrace();
@@ -193,6 +195,7 @@ public class LiveAfterSalesController extends BaseController
         logs.setOperator(loginUser.getUser().getNickName());
         logs.setStoreAfterSalesId(liveAfterSales.getId());
         logs.setChangeMessage(FsStoreAfterSalesStatusEnum.STATUS_2.getDesc());
+        liveAfterSales.setStatus(FsStoreAfterSalesStatusEnum.STATUS_2.getValue());
         liveAfterSalesLogsService.insertLiveAfterSalesLogs(logs);
         return toAjax(liveAfterSalesService.updateLiveAfterSales(liveAfterSales));
     }

fs-admin/src/main/java/com/fs/live/controller/LiveController.java

@@ -93,7 +93,7 @@ public class LiveController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody Live live) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        log.warn("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( live));
+        log.info("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( live));
         return toAjax(liveService.updateLive(live));
     }
 
@@ -105,7 +105,7 @@ public class LiveController extends BaseController {
     @DeleteMapping("/{liveIds}")
     public AjaxResult remove(@PathVariable Long[] liveIds) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        log.warn("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( liveIds));
+        log.info("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( liveIds));
         return toAjax(liveService.deleteLiveByLiveIds(liveIds, new Live()));
     }
 
@@ -130,7 +130,7 @@ public class LiveController extends BaseController {
     @PostMapping("/handleShelfOrUn")
     public R handleShelfOrUn(@RequestBody LiveListVo listVo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        log.warn("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( listVo));
+        log.info("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( listVo));
         return liveService.handleShelfOrUnAdmin(listVo);
     }
 
@@ -141,7 +141,7 @@ public class LiveController extends BaseController {
     @PostMapping("/handleDeleteSelected")
     public R handleDeleteSelected(@RequestBody LiveListVo listVo) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        log.warn("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( listVo));
+        log.info("loginUser:{},update:{}", loginUser.getUserId(), JSON.toJSONString( listVo));
         return liveService.handleDeleteSelectedAdmin(listVo);
     }
     /**

fs-admin/src/main/java/com/fs/qw/controller/QwSopController.java

@@ -21,6 +21,8 @@ import com.fs.sop.params.QwSopAutoTime;
 import com.fs.sop.params.QwSopEditQwUserParam;
 import com.fs.sop.service.IQwSopService;
 import com.fs.sop.vo.SopVoiceListVo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -59,8 +61,8 @@ public class QwSopController extends BaseController
      * 查询企微sop列表
      */
     @PreAuthorize("@ss.hasPermi('qw:sop:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QwSop qwSop)
+    @PostMapping("/list")
+    public R list(@RequestBody  QwSop qwSop)
     {
         List<String> userIds = qwSop.getUserIds();
         if (userIds != null && !userIds.isEmpty()) {
@@ -68,14 +70,23 @@ public class QwSopController extends BaseController
             if (longs != null && !longs.isEmpty()) {
                 qwSop.getQwUserIdList().addAll(longs);
             }else {
-                return getDataTable(new ArrayList<>());
+                return R.ok().put("data",new ArrayList<>());
             }
         }
 
 
-        startPage();
+        if(qwSop.getPageNum() == null) {
+            qwSop.setPageNum(1);
+        }
+        if(qwSop.getPageSize() == null) {
+            qwSop.setPageSize(10);
+        }
+
+        PageHelper.startPage(qwSop.getPageNum(), qwSop.getPageSize());
+
         List<QwSop> list = qwSopService.selectQwSopList(qwSop);
-        return getDataTable(list);
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -117,8 +128,8 @@ public class QwSopController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('qw:sop:export')")
     @Log(title = "企微sop", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(QwSop qwSop)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody QwSop qwSop)
     {
         List<QwSop> list = qwSopService.selectQwSopList(qwSop);
         ExcelUtil<QwSop> util = new ExcelUtil<QwSop>(QwSop.class);

fs-admin/src/main/java/com/fs/qw/controller/QwSopTempController.java

@@ -22,6 +22,8 @@ import com.fs.sop.params.QwSopShareTempParam;
 import com.fs.sop.service.IQwSopTempService;
 import com.fs.sop.vo.UpdateRedVo;
 import com.fs.voice.utils.StringUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -51,10 +53,10 @@ public class QwSopTempController extends BaseController
      * 查询sop模板列表
      */
     @PreAuthorize("@ss.hasPermi('qw:sopTemp:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QwSopTemp qwSopTemp)
+    @PostMapping("/list")
+    public R list(@RequestBody QwSopTemp qwSopTemp)
     {
-        startPage();
+
 //        List<QwSopTemp> list = qwSopTempService.selectQwSopTempList(qwSopTemp);
         List<QwSopTemp> list = qwSopTempService.selectQwSopTempListNew(qwSopTemp);
         // 收集所有需要查询的用户ID
@@ -85,7 +87,16 @@ public class QwSopTempController extends BaseController
             });
         }
 
-        return getDataTable(list);
+        if(qwSopTemp.getPageNum() == null) {
+            qwSopTemp.setPageNum(1);
+        }
+        if(qwSopTemp.getPageSize() == null) {
+            qwSopTemp.setPageSize(10);
+        }
+
+        PageHelper.startPage(qwSopTemp.getPageNum(), qwSopTemp.getPageSize());
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -93,8 +104,8 @@ public class QwSopTempController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('qw:sopTemp:export')")
     @Log(title = "sop模板", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(QwSopTemp qwSopTemp)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody QwSopTemp qwSopTemp)
     {
         List<QwSopTemp> list = qwSopTempService.selectQwSopTempList(qwSopTemp);
         ExcelUtil<QwSopTemp> util = new ExcelUtil<QwSopTemp>(QwSopTemp.class);

fs-admin/src/main/java/com/fs/web/controller/system/SysLoginController.java

@@ -1,22 +1,28 @@
 package com.fs.web.controller.system;
 
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysRole;
+import com.fs.common.core.domain.model.LoginUser;
+import com.fs.common.core.redis.RedisCache;
+import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.PatternUtils;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.ip.IpUtils;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.config.MedicalMallConfig;
 import com.fs.system.service.ISysRoleService;
+import com.fs.system.service.ISysUserService;
 import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.web.bind.annotation.*;
 import com.fs.common.constant.Constants;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.entity.SysMenu;
@@ -33,7 +39,7 @@ import com.fs.system.service.ISysMenuService;
 
  */
 @RestController
-
+@Slf4j
 public class SysLoginController
 {
     @Autowired
@@ -54,6 +60,18 @@ public class SysLoginController
     @Autowired
     private MedicalMallConfig medicalMallConfig;
 
+    @Autowired
+    RedisCache redisCache;
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
     /**
      * 登录方法
      *
@@ -141,4 +159,108 @@ public class SysLoginController
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }
+
+    @PostMapping("/checkIsNeedCheck")
+    public boolean checkIsNeedCheck(@RequestBody LoginBody loginBody)
+    {
+//        return  false;
+        return loginService.checkIsNeedCheck(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid());
+    }
+
+    @PostMapping("/checkCode")
+    public AjaxResult checkCode(@RequestBody Map<String,String> map)
+    {
+        String phone = map.get("phone");
+        String code = map.get("code");
+        String smsKey = "doctorLogin:sms:" + map.get("phone");
+        String smsCode = redisCache.getCacheObject(smsKey);
+
+        if (smsCode == null) {
+            throw new ServiceException("验证码已过期，请重新发送");
+        } else {
+            String string = redisCache.getCacheObject("doctorLogin:sms:" + phone).toString();
+            if (!string.equals(code)){
+                throw new ServiceException("验证码错误");
+            }else{
+                redisCache.deleteObject("doctorLogin:sms:" + phone);
+                List<SysUser> sysUsers = userService.selectUserByPhone(phone);
+                if(sysUsers.size()>1){
+                    throw new ServiceException("此电话号码绑定了多个医生，请核实");
+                }
+                SysUser sysUser = sysUsers.get(0);
+                String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
+                String username = sysUser.getUserName();
+
+                // 调 UserDetailsServiceImpl.loadUserByUsername 获取完整 LoginUser
+                sysUser.setLoginIp(ipAddr);
+                sysUser.setLoginDate(new Date());
+                userService.updateUserProfile(sysUser);
+                LoginUser loginUser = (LoginUser) userDetailsService.loadUserByUsername(username);
+                String token = tokenService.createToken(loginUser);
+                AjaxResult ajax = AjaxResult.success();
+                ajax.put(Constants.TOKEN, token);
+                return ajax;
+            }
+        }
+    }
+
+    @GetMapping("/checkWechatScan")
+    public AjaxResult checkWechatScan(@RequestParam String ticket)
+    {
+        String status = redisCache.getCacheObject("wechat:scan:" + ticket);
+        if ("ok".equals(status)) {
+            String username = redisCache.getCacheObject("login:ticket:" + ticket);
+            redisCache.deleteObject("login:ticket:" + ticket);
+            redisCache.deleteObject("wechat:scan:" + ticket);
+            SysUser sysUser = userService.selectUserByUserName(username);
+
+            String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
+            String loginIp = sysUser.getLoginIp();
+            if (com.fs.common.utils.StringUtils.isEmpty(loginIp)) {
+                sysUser.setLoginIp(ipAddr.trim());
+            } else {
+                List<String> ipList = Arrays.stream(loginIp.split(","))
+                        .map(String::trim)       // 去掉前后空格
+                        .filter(s -> !s.isEmpty())
+                        .distinct()              // 去重
+                        .collect(Collectors.toList());
+
+                String newIp = ipAddr.trim();
+                if (!ipList.contains(newIp)) {
+                    ipList.add(newIp);
+                }
+
+                sysUser.setLoginIp(String.join(",", ipList));
+            }
+
+            sysUser.setLoginDate(new Date());
+            userService.updateUserProfile(sysUser);
+            LoginUser loginUser = (LoginUser) userDetailsService.loadUserByUsername(username);
+            String token = tokenService.createToken(loginUser);
+            if (token != null){
+                return AjaxResult.success(Constants.TOKEN, token);
+            }
+            return AjaxResult.success("waiting");
+        }else if (com.fs.common.utils.StringUtils.isNotEmpty(status)&&status.startsWith("error:")) {
+            // 把错误返回给前端
+            throw new ServiceException(status);
+        }
+        return null;
+    }
+
+    @PostMapping("/getWechatQrCode")
+    public AjaxResult getWechatQrCode(@RequestBody Map<String,String> params) throws Exception {
+        Map<String,String> qr = loginService.getWechatQrCode(params.get("username"));
+        return AjaxResult.success(qr);
+    }
+    @GetMapping("/callback")
+    public String wechatCallback(@RequestParam String code, @RequestParam String state) {
+        try {
+            log.info("触发回调");
+            loginService.handleCallback(code, state);
+            return "success"; // 微信要求返回内容，显示给用户即可
+        } catch (Exception e) {
+            return "error";
+        }
+    }
 }

fs-common/src/main/java/com/fs/common/core/domain/entity/SysUser.java

@@ -103,6 +103,16 @@ public class SysUser extends BaseEntity
     @Excel(name = "角色名称")
     private List<String> roleName;
 
+    private String unionId;
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
     public SysUser()
     {
 

fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java

@@ -451,4 +451,37 @@ public class RedisCache
     public Long size(String key) {
         return redisTemplate.opsForHash().size(key);
     }
+
+    // ========== 新增Hash操作方法 ==========
+    /**
+     * 存储Hash结构：field-value
+     */
+    public <T> void hPut(String mainKey, String field, T value) {
+        redisTemplate.opsForHash().put(mainKey, field, value);
+    }
+
+    /**
+     * 获取Hash中指定field的值
+     */
+    public <T> T hGet(String mainKey, String field) {
+        return (T) redisTemplate.opsForHash().get(mainKey, field);
+    }
+
+    /**
+     * 获取Hash中所有field-value（方便批量读取）
+     */
+    public Map<String, Object> hGetAll(String mainKey) {
+        return (Map<String, Object>) redisTemplate.opsForHash().entries(mainKey);
+    }
+
+    /**
+     * 删除Hash中指定field
+     */
+    public void hDel(String mainKey, Object... fields) {
+        redisTemplate.opsForHash().delete(mainKey, (Object[]) fields);
+    }
+
+    public boolean hasKey(String key) {
+        return Boolean.TRUE.equals(redisTemplate.hasKey(key));
+    }
 }

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

@@ -4,11 +4,18 @@ import com.alibaba.fastjson.JSONObject;
 import com.fs.common.constant.Constants;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.exception.ServiceException;
+import com.fs.common.exception.user.CaptchaException;
+import com.fs.common.exception.user.CaptchaExpireException;
+import com.fs.common.exception.user.UserPasswordNotMatchException;
+import com.fs.common.utils.MessageUtils;
 import com.fs.common.utils.PatternUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.CompanyMenu;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyMenuService;
+import com.fs.framework.manager.AsyncManager;
+import com.fs.framework.manager.factory.AsyncFactory;
 import com.fs.framework.security.LoginBody;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.CompanyLoginService;
@@ -16,13 +23,16 @@ import com.fs.framework.service.CompanyPermissionService;
 import com.fs.framework.service.TokenService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.service.ISysConfigService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -31,6 +41,7 @@ import java.util.Set;
 
  */
 @RestController
+@Slf4j
 public class CompanyLoginController
 {
     @Autowired
@@ -133,5 +144,41 @@ public class CompanyLoginController
         return AjaxResult.success(false);
     }
 
+    @PostMapping("/checkIsNeedCheck")
+    public boolean checkIsNeedCheck(@RequestBody LoginBody loginBody)
+    {
+//        return false;
+        return loginService.checkIsNeedCheck(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid());
+    }
+
+    @PostMapping("/getWechatQrCode")
+    public AjaxResult getWechatQrCode(@RequestBody Map<String,String> params) throws Exception {
+        Map<String,String> qr = loginService.getWechatQrCode(params.get("username"));
+        return AjaxResult.success(qr);
+    }
+
+    @GetMapping("/checkWechatScan")
+    public AjaxResult checkWechatScan(@RequestParam String ticket) {
+        //log.info("触发轮询");
+        String token = loginService.checkWechatScan(ticket);
+        Map<String, String> stringStringMap = Collections.singletonMap(Constants.TOKEN, token);
+        if (token != null){
+            return AjaxResult.success(Constants.TOKEN, token);
+        }
+        return AjaxResult.success("waiting");
+    }
+
+    @GetMapping("/callback")
+    public String wechatCallback(@RequestParam String code, @RequestParam String state) {
+        try {
+            log.info("触发回调");
+            loginService.handleCallback(code, state);
+            return "success"; // 微信要求返回内容，显示给用户即可
+        } catch (Exception e) {
+            return "error";
+        }
+    }
+
+
 }
 

fs-company/src/main/java/com/fs/company/controller/live/LiveController.java

@@ -15,9 +15,17 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.security.SecurityUtils;
 import com.fs.framework.service.TokenService;
+import com.fs.huifuPay.domain.HuiFuQueryOrderResult;
+import com.fs.huifuPay.sdk.opps.core.request.V2TradePaymentScanpayQueryRequest;
+import com.fs.huifuPay.service.HuiFuService;
 import com.fs.live.domain.Live;
 import com.fs.live.domain.LiveCompanyCode;
+import com.fs.live.domain.LiveOrder;
+import com.fs.live.domain.LiveOrderPayment;
+import com.fs.live.mapper.LiveOrderMapper;
+import com.fs.live.mapper.LiveOrderPaymentMapper;
 import com.fs.live.service.ILiveCompanyCodeService;
+import com.fs.live.service.ILiveOrderService;
 import com.fs.live.service.ILiveService;
 import com.fs.live.vo.LiveListVo;
 import com.fs.system.oss.OSSFactory;
@@ -29,10 +37,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * 直播Controller

fs-company/src/main/java/com/fs/company/controller/live/LiveDataController.java

@@ -135,7 +135,7 @@ public class LiveDataController extends BaseController
     @PostMapping("/listLiveData")
     public R listLiveData(@RequestBody LiveDataParam param, HttpServletRequest request)
     {
-        param.setCompanyId(tokenService.getLoginUser(request).getUser().getCompanyId());
+//        param.setCompanyId(tokenService.getLoginUser(request).getUser().getCompanyId());
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         return liveDataService.listLiveData(param);
     }

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

@@ -7,6 +7,7 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.DictUtils;
 import com.fs.common.utils.PubFun;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
@@ -370,6 +371,10 @@ public class QwExternalContactController extends BaseController
 
             if (!StringUtil.strIsNullOrEmpty(item.getState()) && !wayList.isEmpty()) {
                 item.setState(item.getState()+"-"+getContactWayNameStream(item.getState(), wayList));
+
+            }
+            if (item.getStatus()!=null){
+                item.setStatusName(DictUtils.getDictLabel("sys_qw_external_contact_status", String.valueOf(item.getStatus())));
             }
         });
         ExcelUtil<QwExternalContactVO> util = new ExcelUtil<QwExternalContactVO>(QwExternalContactVO.class);
@@ -457,7 +462,12 @@ public class QwExternalContactController extends BaseController
     @Log(title = "添加标签", businessType = BusinessType.UPDATE)
     @PostMapping("/addTag")
     public R addTag(@RequestBody QwExternalContactAddTagParam Param) throws JSONException {
-
+        if(Param.isFilter()){
+            Param.setUserIds(getList(Param.getAddType(), Param.getParam()));
+        }
+        if(Param.getUserIds() == null || Param.getUserIds().isEmpty()){
+            return R.error("修改用户为空");
+        }
         return qwExternalContactService.addUserTag(Param);
     }
 

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

@@ -59,6 +59,16 @@ public class QwTagGroupController extends BaseController
         List<QwTagGroupListVO> list = qwTagGroupService.selectQwTagGroupListVO(qwTagGroup);
         return getDataTable(list);
     }
+    /**
+     * 所有标签列表 模糊查询标签名称
+     */
+    @GetMapping("/allListPage")
+    public TableDataInfo allListPage(QwTagGroup qwTagGroup)
+    {
+        startPage();
+        List<QwTagGroupListVO> list = qwTagGroupService.selectQwTagGroupListVOPage(qwTagGroup);
+        return getDataTable(list);
+    }
     @PreAuthorize("@ss.hasPermi('qw:tagGroup:sync')")
     @Log(title = "同步标签", businessType = BusinessType.INSERT)
     @PostMapping("/syncTag/{corpId}")

fs-company/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -100,7 +100,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/chat/upload/**","/login", "/register", "/captchaImage").anonymous()
+                .antMatchers("/chat/upload/**","/login", "/register", "/captchaImage","/checkIsNeedCheck","/getWechatQrCode","/checkWechatScan","/callback").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

fs-company/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -1,26 +1,41 @@
 package com.fs.framework.service;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fs.common.constant.Constants;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.exception.user.CaptchaException;
 import com.fs.common.exception.user.CaptchaExpireException;
 import com.fs.common.exception.user.UserPasswordNotMatchException;
+import com.fs.common.service.WechatLoginService;
 import com.fs.common.utils.MessageUtils;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.ip.IpUtils;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyUserService;
 import com.fs.framework.manager.AsyncManager;
 import com.fs.framework.manager.factory.AsyncFactory;
 import com.fs.framework.security.LoginUser;
 import com.fs.his.domain.StoreLoginUser;
 import com.fs.system.service.ISysConfigService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * 登录校验方法
@@ -28,6 +43,7 @@ import java.util.concurrent.TimeUnit;
  
  */
 @Component
+@Slf4j
 public class CompanyLoginService
 {
     @Autowired
@@ -39,6 +55,24 @@ public class CompanyLoginService
     @Autowired
     private RedisCache redisCache;
 
+    @Autowired
+    private ICompanyUserService companyUserService;
+
+    @Value("${wechat.company.appid}")
+    private String appId;
+    @Value("${wechat.company.secret}")
+    private String secret;
+    @Value("${wechat.company.redirectUri}")
+    private String redirectUri;
+    @Value("${wechat.isNeedScan}")
+    private Boolean isNeedScan;
+
+    @Autowired
+    private WechatLoginService wechatLoginService;
+
+    @Autowired
+    private UserDetailsService userDetailsService;
+
     /**
      * 登录验证
      *
@@ -91,4 +125,227 @@ public class CompanyLoginService
         return tokenService.createToken(loginUser);
     }
 
+
+    public boolean checkIsNeedCheck(String username, String password, String code, String uuid)
+    {
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+        String captcha = redisCache.getCacheObject(verifyKey);
+        //redisCache.deleteObject(verifyKey);
+        if (captcha == null)
+        {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(0l,username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha))
+        {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(0l,username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+            throw new CaptchaException();
+        }
+        // 用户验证
+        Authentication authentication = null;
+        try
+        {
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            authentication = authenticationManager
+                    .authenticate(new UsernamePasswordAuthenticationToken(username, password));
+        }
+        catch (Exception e)
+        {
+            if (e instanceof BadCredentialsException)
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(0l,username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                throw new UserPasswordNotMatchException();
+            }
+            else
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(0l,username, Constants.LOGIN_FAIL, e.getMessage()));
+                throw new ServiceException(e.getMessage());
+            }
+        }
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        //查询当前登录用户信息
+        CompanyUser companyUser = companyUserService.selectCompanyUserById(loginUser.getUser().getUserId());
+
+        Long[] userIds = new Long[]{2020L};
+        for (Long userId : userIds) {
+            if (userId.equals(companyUser.getUserId())) {
+                return false;
+            }
+        }
+
+        // 判断是否开启了扫码配置
+        if (ObjectUtil.isEmpty(isNeedScan) || !isNeedScan){
+            return false;
+        }
+
+        //true → 要发短信验证码再登录
+        //false → 直接登录
+        return needCheck(companyUser);
+    }
+
+    public boolean needCheck(CompanyUser companyUser) {
+        // 1. 校验 IP
+        if (!checkIp(companyUser)) {
+            // IP 不一致
+            return true;
+        }
+
+        // 2. 校验是否首次登录
+        if (checkIsFirstLogin(companyUser)) {
+            return true;
+        }
+
+        // 3. 校验上次登录时间是否在五天前
+        if (checkIsLoginTime(companyUser)) {
+            return true;
+        }
+
+        // 4. 检查是否在设置的某一天
+        /*if (checkIsSpecialDay(new Date())) {
+            return true;
+        }*/
+        if (haveUnionId(companyUser)){
+            return true;
+        }
+
+        return false;
+    }
+
+    public boolean checkIp(CompanyUser companyUser) {
+        // 获取当前 IP
+        String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest()).split(",")[0].trim();
+
+        // 获取已记录的登录 IP
+        String lastLoginIp = companyUser.getLoginIp();
+
+        if (StringUtils.isNotEmpty(lastLoginIp)) {
+            List<String> ipList = Arrays.stream(lastLoginIp.split(","))
+                    .map(String::trim)
+                    .filter(s -> !s.isEmpty())
+                    .distinct()
+                    .collect(Collectors.toList());
+
+            return ipList.contains(ipAddr);
+        }
+        return false;
+    }
+
+    //检查是否第一次登录
+    public boolean checkIsFirstLogin(CompanyUser companyUser){
+        // 获取上次登录 IP
+        String lastLoginIp = companyUser.getLoginIp();
+        if (StringUtils.isEmpty(lastLoginIp)||companyUser.getLoginDate()==null){
+            return true;
+        }
+        return false;
+    }
+    public boolean checkIsLoginTime(CompanyUser companyUser) {
+        // 获取上次登录时间
+        Date loginDate = companyUser.getLoginDate();
+        if (loginDate == null) {
+            // 没有登录记录，直接返回 true（需要处理）
+            return true;
+        }
+
+        // 当前时间
+        Date now = new Date();
+
+        // 计算两个时间的毫秒差
+        long diff = now.getTime() - loginDate.getTime();
+
+        // 5天 = 5 * 24 * 60 * 60 * 1000 毫秒
+        long fiveDays = 5L * 24 * 60 * 60 * 1000;
+
+        return diff >= fiveDays;
+    }
+
+    public boolean haveUnionId( CompanyUser companyUser){
+        if (StringUtils.isEmpty(companyUser.getUnionId())){
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取微信登录二维码参数
+     * @param username 当前登录用户名
+     * @return 二维码参数
+     */
+    public Map<String, String> getWechatQrCode(String username) throws Exception {
+        // 生成 loginTicket
+        String ticket = UUID.randomUUID().toString();
+        redisCache.setCacheObject("login:ticket:" + ticket, username, 60, TimeUnit.SECONDS);
+
+        return wechatLoginService.getQrCode(ticket,appId,secret,redirectUri); // 返回二维码参数
+    }
+
+    public String checkWechatScan(String ticket) {
+        String status = redisCache.getCacheObject("wechat:scan:" + ticket);
+        if ("ok".equals(status)) {
+            String username = redisCache.getCacheObject("login:ticket:" + ticket);
+            redisCache.deleteObject("login:ticket:" + ticket);
+            redisCache.deleteObject("wechat:scan:" + ticket);
+            CompanyUser companyUser = companyUserService.selectUserByUserName(username);
+
+            // 调 UserDetailsServiceImpl.loadUserByUsername 获取完整 LoginUser
+            LoginUser loginUser = (LoginUser) userDetailsService.loadUserByUsername(username);
+            companyUser.setUserId(loginUser.getUser().getUserId());
+            String loginIp = companyUser.getLoginIp();
+            String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest()).split(",")[0].trim();
+            log.info("销售用户{}扫码验证过后登录获取到的ip地址{}", loginUser.getUser().getUserId(), ipAddr);
+            List<String> ipList = new ArrayList<>();
+            if (StringUtils.isNotEmpty(loginIp)) {
+                String[] ips = loginIp.split(",");
+                for (String ip : ips) {
+                    ip = ip.trim();
+                    if (!ip.isEmpty()) {
+                        ipList.add(ip);
+                    }
+                }
+            }
+            ipList.add(ipAddr);
+            List<String> distinctList = ipList.stream()
+                    .map(String::trim)       // 再次确保去掉空格
+                    .distinct()
+                    .collect(Collectors.toList());
+            companyUser.setLoginIp(String.join(",", distinctList));
+            companyUser.setLoginDate(new Date());
+            companyUserService.updateCompanyUser(companyUser);
+            return tokenService.createToken(loginUser);
+        }else if (StringUtils.isNotEmpty(status)&&status.startsWith("error:")) {
+            // 把错误返回给前端
+            throw new ServiceException(status);
+        }
+        return null;
+    }
+    /**
+     * 微信扫码回调
+     */
+    public void handleCallback(String code, String ticket) {
+        String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appId
+                + "&secret=" + secret
+                + "&code=" + code
+                + "&grant_type=authorization_code";
+
+        JSONObject json = JSON.parseObject(HttpUtil.get(url));
+        String unionid = json.getString("unionid");
+        if (unionid == null) throw new ServiceException("微信授权失败");
+
+        String username = redisCache.getCacheObject("login:ticket:" + ticket);
+        if (username == null) throw new ServiceException("ticket无效或过期");
+        CompanyUser companyUser = companyUserService.selectUserByUserName(username);
+        if (companyUser == null) throw new ServiceException("用户不存在");
+        if (companyUser.getUnionId() == null || companyUser.getUnionId().isEmpty()) {
+            // 如果用户没有绑定 unionid，则绑定当前扫码用户的 unionid
+            companyUser.setUnionId(unionid);
+            companyUserService.updateCompanyUser(companyUser);
+        } else if (!companyUser.getUnionId().equals(unionid)) {
+            // 如果用户已绑定 unionid，但与扫码用户不一致，则拒绝登录
+            redisCache.setCacheObject("wechat:scan:" + ticket, "error:账号与绑定用户不匹配", 30, TimeUnit.SECONDS);
+            return;
+        }
+
+        redisCache.setCacheObject("wechat:scan:" + ticket, "ok", 30, TimeUnit.SECONDS);
+    }
+
 }

fs-framework/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/getWechatQrCode","/checkWechatScan","/callback","/checkIsNeedCheck").anonymous()
                 .antMatchers("/app/common/test").anonymous()
                 .antMatchers("/ad/adDyApi/authorized").anonymous()
                 .antMatchers(

fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java

@@ -1,7 +1,14 @@
 package com.fs.framework.web.service;
 
 import javax.annotation.Resource;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.fs.common.service.WechatLoginService;
+import com.fs.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -24,6 +31,9 @@ import com.fs.framework.manager.factory.AsyncFactory;
 import com.fs.system.service.ISysConfigService;
 import com.fs.system.service.ISysUserService;
 
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 登录校验方法
  * 
@@ -46,6 +56,17 @@ public class SysLoginService
 
     @Autowired
     private ISysConfigService configService;
+    @Autowired
+    private WechatLoginService wechatLoginService;
+
+    @Value("${wechat.admin.appid}")
+    private String appId;
+    @Value("${wechat.admin.secret}")
+    private String secret;
+    @Value("${wechat.admin.redirectUri}")
+    private String redirectUri;
+    @Value("${wechat.isNeedScan}")
+    private Boolean isNeedScan;
 
     /**
      * 登录验证
@@ -126,4 +147,179 @@ public class SysLoginService
         user.setLoginDate(DateUtils.getNowDate());
         userService.updateUserProfile(user);
     }
+
+
+    public boolean checkIsNeedCheck(String username, String password, String code, String uuid)
+    {
+        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+        String captcha = redisCache.getCacheObject(verifyKey);
+        //redisCache.deleteObject(verifyKey);
+        if (captcha == null)
+        {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha))
+        {
+            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+            throw new CaptchaException();
+        }
+        // 用户验证
+        Authentication authentication = null;
+        try
+        {
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            authentication = authenticationManager
+                    .authenticate(new UsernamePasswordAuthenticationToken(username, password));
+        }
+        catch (Exception e)
+        {
+            if (e instanceof BadCredentialsException)
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                throw new UserPasswordNotMatchException();
+            }
+            else
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+                throw new ServiceException(e.getMessage());
+            }
+        }
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        //查询当前登录用户信息
+        SysUser sysUser = userService.selectUserById(loginUser.getUserId());
+        Long[] userIds = new Long[]{236L, 246L, 247L, 253L,119L};
+        for (Long userId : userIds) {
+            if (userId.equals(sysUser.getUserId())){
+                return false;
+            }
+        }
+
+        // 判断是否开启了扫码配置
+        if (ObjectUtil.isEmpty(isNeedScan) || !isNeedScan){
+            return false;
+        }
+
+        //true → 要发短信验证码再登录
+        //false → 直接登录
+        return needCheck(sysUser);
+    }
+    public boolean needCheck(SysUser sysUser) {
+
+
+        // 1. 校验 IP
+        if (!checkIp(sysUser)) {
+            // IP 不一致
+            return true;
+        }
+
+        // 2. 校验是否首次登录
+        if (checkIsFirstLogin(sysUser)) {
+            return true;
+        }
+
+        // 3. 校验上次登录时间是否在五天前
+        if (checkIsLoginTime(sysUser)) {
+            return true;
+        }
+
+        // 4. 检查是否在设置的某一天
+//        if (checkIsSpecialDay(new Date())) {
+//            return true;
+//        }
+        if (haveUnionId(sysUser)){
+            return true;
+        }
+
+        return false;
+    }
+    public boolean haveUnionId( SysUser sysUser){
+        if (StringUtils.isEmpty(sysUser.getUnionId())){
+            return true;
+        }
+        return false;
+    }
+    public boolean checkIp(SysUser sysUser){
+        // 获取当前 IP
+        String ipAddr = IpUtils.getIpAddr(ServletUtils.getRequest());
+        // 获取已记录的登录 IP
+        String lastLoginIp = sysUser.getLoginIp();
+
+        if (StringUtils.isNotEmpty(lastLoginIp)) {
+            List<String> ipList = Arrays.asList(lastLoginIp.split(","));
+            return ipList.contains(ipAddr);
+        }
+        return false;
+    }
+    //检查是否第一次登录
+    public boolean checkIsFirstLogin(SysUser sysUser){
+        // 获取上次登录 IP
+        String lastLoginIp = sysUser.getLoginIp();
+        if (StringUtils.isEmpty(lastLoginIp)||sysUser.getLoginDate()==null){
+            return true;
+        }
+        return false;
+    }
+    public boolean checkIsLoginTime(SysUser sysUser) {
+        // 获取上次登录时间
+        Date loginDate = sysUser.getLoginDate();
+        if (loginDate == null) {
+            // 没有登录记录，直接返回 true（需要处理）
+            return true;
+        }
+
+        // 当前时间
+        Date now = new Date();
+
+        // 计算两个时间的毫秒差
+        long diff = now.getTime() - loginDate.getTime();
+
+        // 5天 = 5 * 24 * 60 * 60 * 1000 毫秒
+        long fiveDays = 5L * 24 * 60 * 60 * 1000;
+
+        return diff >= fiveDays;
+    }
+
+    /**
+     * 获取微信登录二维码参数
+     * @param account 当前登录用户名
+     * @return 二维码参数
+     */
+    public Map<String, String> getWechatQrCode(String account) throws Exception {
+        // 生成 loginTicket
+        String ticket = UUID.randomUUID().toString();
+        redisCache.setCacheObject("login:ticket:" + ticket, account, 60, TimeUnit.SECONDS);
+
+        return wechatLoginService.getQrCode(ticket,appId,secret,redirectUri); // 返回二维码参数
+    }
+
+    /**
+     * 微信扫码回调
+     */
+    public void handleCallback(String code, String ticket) {
+        String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + appId
+                + "&secret=" + secret
+                + "&code=" + code
+                + "&grant_type=authorization_code";
+
+        JSONObject json = JSON.parseObject(cn.hutool.http.HttpUtil.get(url));
+        String unionid = json.getString("unionid");
+        if (unionid == null) throw new ServiceException("微信授权失败");
+
+        String username = redisCache.getCacheObject("login:ticket:" + ticket);
+        if (username == null) throw new ServiceException("ticket无效或过期");
+        SysUser sysUser = userService.selectUserByUserName(username);
+        if (sysUser == null) throw new ServiceException("用户不存在");
+        if (sysUser.getUnionId() == null || sysUser.getUnionId().isEmpty()) {
+            // 如果用户没有绑定 unionid，则绑定当前扫码用户的 unionid
+            sysUser.setUnionId(unionid);
+            userService.updateUserProfile(sysUser);
+        } else if (!sysUser.getUnionId().equals(unionid)) {
+            // 如果用户已绑定 unionid，但与扫码用户不一致，则拒绝登录
+            redisCache.setCacheObject("wechat:scan:" + ticket, "error:账号与绑定用户不匹配", 30, TimeUnit.SECONDS);
+            return;
+        }
+
+        redisCache.setCacheObject("wechat:scan:" + ticket, "ok", 30, TimeUnit.SECONDS);
+    }
 }

fs-live-app/src/main/java/com/fs/live/controller/LiveController.java

@@ -120,12 +120,13 @@ public class LiveController {
 
 	@PostMapping("/videoUpload")
 	public R videoUpload(HttpServletRequest request, @RequestBody  Map<String, Object> params) {
+		String videoUrl = "https://bjzmkytcpv.ylrzcloud.com/";
 		log.info("请求参数：{}", params);
 		if(!params.containsKey("WorkflowExecution")) return R.error("参数错误");
 
 		LinkedHashMap<String,Object> result = (LinkedHashMap<String,Object>) params.get("WorkflowExecution");
 		String string = result.get("Object").toString();
-		videoService.updateFinishStatus("https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/" + string.replace(".mp4", ".m3u8"));
+		videoService.updateFinishStatus(videoUrl + string.replace(".mp4", "-1080.m3u8"));
 
 		return R.ok();
 //		{app=200149.push.tlivecloud.com, appid=1319721001, appname=live, channel_id=673,

fs-service/src/main/java/com/fs/common/service/WechatLoginService.java

@@ -0,0 +1,49 @@
+package com.fs.common.service;
+
+import com.fs.common.core.redis.RedisCache;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+public class WechatLoginService {
+
+    @Autowired
+    private RedisCache redisCache;
+    /**
+     * 获取二维码参数
+     */
+    public Map<String, String> getQrCode(String ticket,String appId,String secret,String redirectUri) throws UnsupportedEncodingException {
+        String username = redisCache.getCacheObject("login:ticket:" + ticket);
+        if (username == null) throw new RuntimeException("ticket无效或过期");
+
+        Map<String, String> data = new HashMap<>();
+        data.put("appid", appId);
+        data.put("scope", "snsapi_login");
+        data.put("state", ticket);
+        data.put("redirect_uri", redirectUri);
+
+        // 拼接完整的微信扫码 URL
+        String url = "https://open.weixin.qq.com/connect/qrconnect?appid=" + appId
+                + "&redirect_uri=" + URLEncoder.encode(redirectUri, StandardCharsets.UTF_8.name())
+                + "&response_type=code"
+                + "&scope=snsapi_login"
+                + "&state=" + ticket
+                + "#wechat_redirect";
+        data.put("url", url);
+        log.info("url{}",url);
+        return data;
+    }
+
+
+
+
+
+}

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

@@ -94,6 +94,16 @@ public class CompanyUser extends BaseEntity
     /** 医生id */
     private Long doctorId;
 
+    private String unionId;
+
+    public String getUnionId() {
+        return unionId;
+    }
+
+    public void setUnionId(String unionId) {
+        this.unionId = unionId;
+    }
+
     public String getIdCard() {
         return idCard;
     }

fs-service/src/main/java/com/fs/course/param/FsCourseAnswerLogsParam.java

@@ -36,8 +36,8 @@ public class FsCourseAnswerLogsParam  extends BaseEntity  {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sTime;
 
-    private Long pageNum;
-    private Long pageSize;
+    private Integer pageNum;
+    private Integer pageSize;
 
     /**
      * 用户（昵称_id组合）

fs-service/src/main/java/com/fs/course/param/FsCourseRedPacketLogParam.java

@@ -41,6 +41,8 @@ public class FsCourseRedPacketLogParam {
     @TableField(exist = false)
     private List<String> companyUserIds=new ArrayList<>();
 
+    private Integer pageNum;
+    private Integer pageSize;
 
     public List<String> getCompanyUserIds() {
         if (companyUserIds == null || companyUserIds.isEmpty()) {

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -110,6 +110,10 @@ public class FsCourseWatchLogListParam implements Serializable {
     private List<Long> deptIds;
     private String ids;
 
+
+    private Integer pageNum;
+    private Integer pageSize;
+
     @TableField(exist = false)
     private List<String> userIds = new ArrayList<>();
 

fs-service/src/main/java/com/fs/erp/service/impl/FsJstAftersalePushScrmServiceImpl.java

@@ -22,6 +22,12 @@ import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.mapper.FsStoreAfterSalesScrmMapper;
 import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
 import com.fs.hisStore.service.IFsStoreOrderItemScrmService;
+import com.fs.live.domain.LiveOrder;
+import com.fs.live.domain.LiveOrderItem;
+import com.fs.live.mapper.LiveOrderMapper;
+import com.fs.live.mapper.LiveOrderPaymentMapper;
+import com.fs.live.service.ILiveOrderItemService;
+import com.fs.live.service.ILiveOrderPaymentService;
 import com.fs.ybPay.dto.RefundOrderDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.util.Asserts;
@@ -45,6 +51,13 @@ public class FsJstAftersalePushScrmServiceImpl implements FsJstAftersalePushScrm
 
     @Autowired
     private FsStoreOrderScrmMapper fsStoreOrderMapper;
+    @Autowired
+    private LiveOrderMapper liveOrderMapper;
+
+    @Autowired
+    private ILiveOrderItemService liveOrderItemService;
+    @Autowired
+    private LiveOrderPaymentMapper liveOrderPaymentMapper;
 
     @Autowired
     private IFsStoreOrderItemScrmService storeOrderItemService;
@@ -65,21 +78,37 @@ public class FsJstAftersalePushScrmServiceImpl implements FsJstAftersalePushScrm
                 log.info("获取记录{} 锁失败!",item.getId());
                 continue;
             }
-
+            item.setRetryCount(item.getRetryCount()+1);
             FsStoreOrderScrm fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(item.getOrderId());
+            LiveOrder liveOrder = null;
+            // 拆开，现在分为商城订单和直播订单
+            if (fsStoreOrder == null) {
+                liveOrder = liveOrderMapper.selectLiveOrderByOrderCode(item.getOrderId());
+                if (liveOrder == null) {
+                    item.setErrorMessage("该订单未找到!");
+                    item.setTaskStatus(TaskStatusEnum.FAILED.getCode());
+                    log.info("该订单未找到!");
+                    fsJstAftersalePushMapper.update(item);
+                    continue;
+                }
+            }
 
-            item.setRetryCount(item.getRetryCount()+1);
 
-            if(fsStoreOrder == null){
-                item.setErrorMessage("该订单未找到!");
-                item.setTaskStatus(TaskStatusEnum.FAILED.getCode());
-                log.info("该订单未找到!");
-                fsJstAftersalePushMapper.update(item);
+            RefundOrderDTO dto;
+            try {
+                if(fsStoreOrder != null){
+                    dto = getAfterSaleDTO(item, fsStoreOrder);
+                }else {
+                    dto = getAfterSaleLiveDTO(item, liveOrder);
+                }
+            } catch (Exception e) {
+                log.error("订单售后创建售后信息失败：{}" ,e.getMessage());
                 continue;
             }
-            Asserts.notNull(fsStoreOrder,"该订单未找到!");
-            RefundOrderDTO dto;
-            dto = getAfterSaleDTO(item, fsStoreOrder);
+
+
+
+
             // 买家已经申请，等待卖家同意
             if(StringUtils.equals(AfterSalesOrderStatusEnum.WAIT_SELLER_AGREE.getIndex().toString()
                     ,item.getType())){
@@ -173,4 +202,40 @@ public class FsJstAftersalePushScrmServiceImpl implements FsJstAftersalePushScrm
         dto.setItems(refundItemDTOS);
         return dto;
     }
+
+    private RefundOrderDTO getAfterSaleLiveDTO(FsJstAftersalePush item, LiveOrder fsStoreOrder) {
+        RefundOrderDTO dto = new RefundOrderDTO();
+        AfterSalesOrderStatusEnum statusEnum = AfterSalesOrderStatusEnum.getByIndex(Integer.valueOf(item.getType()));
+
+        dto.setShopStatus(statusEnum.getCode());
+        dto.setQuestionType("可更新");
+        dto.setOuterAsId(item.getAfterSaleId());
+        dto.setRemark("用户退款");
+        dto.setType("仅退款");
+
+        dto.setShopId(Long.parseLong(shopId));
+        dto.setTotalAmount(fsStoreOrder.getTotalPrice());
+        dto.setSoId(item.getOrderId());
+        dto.setRefund(fsStoreOrder.getPayPrice());
+
+
+        FsStoreOrderItemScrm itemMap=new FsStoreOrderItemScrm();
+//        itemMap.setOrderId(fsStoreOrder.getId());
+        itemMap.setOrderId(fsStoreOrder.getOrderId());
+        List<LiveOrderItem> orderItems=liveOrderItemService.selectCheckedByOrderId(fsStoreOrder.getOrderId());
+        List<RefundItemDTO> refundItemDTOS=new ArrayList<>();
+
+        for(LiveOrderItem orderItem: orderItems) {
+            FsStoreCartDTO cartDTO = JSONUtil.toBean(orderItem.getJsonInfo(), FsStoreCartDTO.class);
+
+            RefundItemDTO itemDTO = new RefundItemDTO();
+            itemDTO.setSkuId(cartDTO.getBarCode());
+            itemDTO.setQty(cartDTO.getNum());
+            itemDTO.setAmount(cartDTO.getPrice());
+            itemDTO.setType("退货");
+            refundItemDTOS.add(itemDTO);
+        }
+        dto.setItems(refundItemDTOS);
+        return dto;
+    }
 }

fs-service/src/main/java/com/fs/fastGpt/domain/FastGptRole.java

@@ -4,6 +4,8 @@ import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 
+import java.sql.Time;
+
 /**
  * 应用对象 fastgpt_role
  *
@@ -65,4 +67,15 @@ public class FastGptRole extends BaseEntity
     private String channelType;
 
     private Integer logistics;
+
+    //回复禁止起始时间
+    private Time forbidSendStart;
+
+    //回复禁止结束时间
+    private Time forbidSendEnd;
+
+    /**
+     * 是否禁止时段回复 0是不开启禁止  1是开启禁止 默认为1
+     */
+    private Integer forbidStatus;
 }

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

@@ -66,14 +66,17 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Nullable;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
+import java.sql.Time;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -169,6 +172,8 @@ public class AiHookServiceImpl implements AiHookService {
     private static final String AI_REPLY = "AI_REPLY:";
     private static final String AI_REPLY_TAG = "AI_REPLY_TAG:";
 
+    private final String DELAY_MSG = "delayMsg";
+
 
     /** Ai半小时未回复提醒 **/
     /**
@@ -479,6 +484,39 @@ public class AiHookServiceImpl implements AiHookService {
                 }
             }
 
+            //规定时间不发送内容
+            if(role.getForbidStatus() == null){
+                role.setForbidStatus(1);
+            }
+
+            if(role.getForbidStatus() == 1){
+                Time forbidSendStart = role.getForbidSendStart()==null? Time.valueOf("00:00:00") :role.getForbidSendStart();
+                Time forbidSendEnd = role.getForbidSendEnd()==null? Time.valueOf("04:59:59") :role.getForbidSendEnd();
+                //设置规定时间不发送消息
+                Time now = Time.valueOf(LocalDateTime.now().toLocalTime());
+                // 判断当前时间是否在禁止发送时间段内
+                if (now.after(forbidSendStart) && now.before(forbidSendEnd)) {
+                    String sessionId = String.valueOf(fastGptChatSession.getSessionId());
+                    log.info("当前时间 {} 在禁止发送时间段内 ({} - {})，会话id:{},跳过回复", now, forbidSendStart, forbidSendEnd,fastGptChatSession.getSessionId());
+
+                    // HSET命令是原子的，多个线程同时写不同field不会互相覆盖；同field会覆盖（符合需求）
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("content",contentEmj);
+                    jsonObject.put("sender",sender);
+                    jsonObject.put("type",type);
+                    String objectString = jsonObject.toString();
+
+                    redisCache.hPut(DELAY_MSG, sessionId, objectString);
+
+                    // 4. 确保主Key有8小时过期时间（只在首次设置时生效，避免重复刷新）
+                    if (!redisCache.hasKey(DELAY_MSG)) {
+                        redisCache.expire(DELAY_MSG, 8, TimeUnit.HOURS);
+                    }
+
+                    return R.ok();
+                }
+            }
+
 
             //判断是否转人工
             if (fastGptChatSession.getIsArtificial()==1){
@@ -549,7 +587,7 @@ public class AiHookServiceImpl implements AiHookService {
                 //从fastgpt_chat_artificial_words表中查询所有转人工文本
                 List<FastgptChatArtificialWords> chatArtificialWords = qwExternalContactMapper.selectChatGptChatArtificialWords();
                 List<String> collect = chatArtificialWords.stream().map(m -> m.getContent()).collect(Collectors.toList());
-                if (collect.stream().anyMatch(contentKh::contains)){
+                if (collect.stream().anyMatch(content::contains)){
                     log.info("触发关键词:"+role.getRoleId()+":"+qwExternalContacts.getName());
                     notifyArtificial(fastGptChatSession.getSessionId(),user,qwExternalContacts.getName()," 触发关键词",qwExternalContacts.getId(),sender);
                     return R.ok();

fs-service/src/main/java/com/fs/his/mapper/FsUserWxMapper.java

@@ -2,6 +2,7 @@ package com.fs.his.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.his.domain.FsUserWx;
+import org.apache.ibatis.annotations.Param;
 
 public interface FsUserWxMapper extends BaseMapper<FsUserWx> {
 
@@ -10,4 +11,6 @@ public interface FsUserWxMapper extends BaseMapper<FsUserWx> {
      * @param wx    配置信息
      */
     void insertOrUpdateByUniqueKey(FsUserWx wx);
+
+    FsUserWx getFsUserWcByUserIdAndAppId(@Param("fsUserId") Long userId,@Param("appId") String appId );
 }

fs-service/src/main/java/com/fs/his/param/FsIntegralOrderParam.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class FsIntegralOrderParam {
@@ -17,6 +18,8 @@ public class FsIntegralOrderParam {
     @Excel(name = "订单编号")
     private String orderCode;
 
+    private List<String> orderCodes;
+
     /** 用户id */
     @Excel(name = "用户id")
     private Long userId;

fs-service/src/main/java/com/fs/his/vo/FsIntegralOrderListVO.java

@@ -84,4 +84,5 @@ public class FsIntegralOrderListVO {
     private String erpPhone;
 
     private String loginAccount;
+    private String goodsName;
 }

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

@@ -393,6 +393,7 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         request.setOid(order.getOrderCode());
         request.setRefund_state(1);
         request.setStoreAfterSalesId(storeAfterSales.getId());
+        request.setOrderStatus(orderStatus);
         if (StringUtils.isNotBlank(order.getExtendOrderId())){
             BaseResponse response=erpOrderService.refundUpdateScrm(request);
             if(response.getSuccess()){

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

@@ -2394,6 +2394,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             request.setTid(order.getOrderCode());
             request.setOid(order.getOrderCode());
             request.setRefund_state(1);
+            request.setOrderStatus(order.getStatus());
             //BaseResponse response=erpOrderService.refundUpdate(request);
 //            if(response.getSuccess()){
 //            }

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

@@ -130,4 +130,12 @@ public class FsStoreOrderItemExportRefundZMVO implements Serializable  {
     @Excel(name = "退款金额" ,sort = 240)
     private BigDecimal refundMoney;
 
+    /** 申请原因 */
+    @Excel(name = "申请原因",sort = 250)
+    private String reasons;
+
+    /** 说明 */
+    @Excel(name = "说明",sort = 260)
+    private String explains;
+
 }

fs-service/src/main/java/com/fs/live/mapper/LiveMapper.java

@@ -138,6 +138,7 @@ public interface LiveMapper
             "select * from live where 1=1 " +
             " <if test='param.companyId!=null' > and company_id = #{param.companyId} </if> and live_type IN (1,2, 3) AND status IN (3, 4) AND is_del = 0 and is_audit=1 " +
             " <if test='param.liveName!=null' > and live_name like concat('%' ,#{param.liveName},'%') </if> " +
+            " <if test='param.startTime!=null and param.endTime!=null' > and start_time between #{param.startTime} and  #{param.endTime}  </if> " +
             " UNION " +
             "select l.* from live l " +
             "LEFT JOIN ( " +
@@ -153,6 +154,7 @@ public interface LiveMapper
             "and TIMESTAMPDIFF(SECOND, l.start_time, NOW()) > COALESCE(video_duration.total_duration, 0) " +
             "and COALESCE(video_duration.total_duration, 0) > 0 " +
             " <if test='param.liveName!=null' > and l.live_name like concat('%' ,#{param.liveName},'%') </if> " +
+            " <if test='param.startTime!=null and param.endTime!=null' > and l.start_time between #{param.startTime} and  #{param.endTime}  </if> " +
             "order by create_time desc" +
             " </script>"})
     List<Live> listLiveData(@Param("param") LiveDataParam param);
@@ -162,6 +164,7 @@ public interface LiveMapper
             "select * from live where 1=1 " +
             " <if test='param.companyId!=null' > and company_id = #{param.companyId} </if> and live_type IN (1,2, 3) AND status IN (3, 4) AND is_del = 0 and is_audit=1 " +
             " <if test='param.liveName!=null' > and live_name like concat('%' ,#{param.liveName},'%') </if> " +
+            " <if test='param.startTime!=null and param.endTime!=null' > and start_time between #{param.startTime} and  #{param.endTime}  </if> " +
             " UNION " +
             "select l.* from live l " +
             "LEFT JOIN ( " +
@@ -177,6 +180,7 @@ public interface LiveMapper
             "and TIMESTAMPDIFF(SECOND, l.start_time, NOW()) > COALESCE(video_duration.total_duration, 0) " +
             "and COALESCE(video_duration.total_duration, 0) > 0 " +
             " <if test='param.liveName!=null' > and l.live_name like concat('%' ,#{param.liveName},'%') </if> " +
+            " <if test='param.startTime!=null and param.endTime!=null' > and l.start_time between #{param.startTime} and  #{param.endTime}  </if> " +
             ") as temp " +
             " </script>"})
     int listLiveDataCount(@Param("param") LiveDataParam param);
@@ -207,6 +211,10 @@ public interface LiveMapper
             "GROUP BY l.live_id, l.start_time")
     Integer selectLiveFlagByLiveId(@Param("liveId") Long liveId);
 
-    @Select("SELECT * FROM live WHERE is_audit = 1 and is_del = 0 and status in (1,2,4) and live_type in (2,3) order by create_time desc")
-    List<Live> listToLiveNoEnd(Live live);
+    @Select({"<script>" +
+            " SELECT * FROM live WHERE is_audit = 1 and is_del = 0 and status in (1,2,4) and live_type in (2,3) " +
+            "  <if test='live.liveName!=null' > and live_name like concat('%',#{live.liveName},'%') </if> " +
+            " order by create_time desc" +
+            " </script>"})
+    List<Live> listToLiveNoEnd(@Param("live") Live live);
 }

fs-service/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -461,6 +461,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
         request.setOid(order.getOrderCode());
         request.setRefund_state(1);
         request.setStoreAfterSalesId(storeAfterSales.getId());
+        request.setOrderStatus(orderStatus);
         if (StringUtils.isNotBlank(order.getExtendOrderId())){
             BaseResponse response=erpOrderService.refundUpdateLive(request);
             if(response.getSuccess()){
@@ -580,9 +581,6 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
     @Override
     public int updateLiveAfterSales(LiveAfterSales liveAfterSales)
     {
-        if (StringUtils.isNotEmpty(liveAfterSales.getDeliveryName()) && StringUtils.isNotEmpty(liveAfterSales.getDeliverySn()) && StringUtils.isNotEmpty(liveAfterSales.getDeliveryCode())) {
-            liveAfterSales.setStatus(2);
-        }
 
         return baseMapper.updateLiveAfterSales(liveAfterSales);
     }

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1177,6 +1177,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             request.setTid(order.getOrderCode());
             request.setOid(order.getOrderCode());
             request.setRefund_state(1);
+            request.setOrderStatus(order.getStatus());
 
             if (ObjectUtils.equals(order.getStatus(), 2)) {
                 LiveAfterSalesParam param = new LiveAfterSalesParam();
@@ -1373,7 +1374,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             request.setTid(order.getOrderCode());
             request.setOid(order.getOrderCode());
             request.setRefund_state(1);
-
+            request.setOrderStatus(order.getStatus());
             if (ObjectUtils.equals(order.getStatus(), 2)) {
                 LiveAfterSalesParam param = new LiveAfterSalesParam();
                 param.setOrderCode(order.getOrderCode());
@@ -1675,7 +1676,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
         erpOrder.setPlatform_code(order.getOrderCode());
         erpOrder.setWarehouse_code(erpConfig.getErpWarehouseCode());
-        erpOrder.setShop_code(erpConfig.getErpShopCode());
+        erpOrder.setShop_code(erpConfig.getErpJstShopCode());
         erpOrder.setBuyer_account(order.getUserName());
 
 //      erpOrder.setPost_fee(order.getTotalPostage().doubleValue());
@@ -1709,13 +1710,13 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             order.setDeliverySn(express.getCode());
         }
         erpOrder.setPayments(payments);
-        if (order.getCompanyId() != null) {
+        if (order.getCompanyId() != null && order.getCompanyId() > 0L) {
             Company company = companyService.selectCompanyById(order.getCompanyId());
             if (company != null) {
                 erpOrder.setSeller_memo(company.getCompanyName());
             }
         }
-        if (order.getCompanyUserId() != null) {
+        if (order.getCompanyUserId() != null && order.getCompanyUserId() > 0L) {
             CompanyUser companyUser = companyUserService.selectCompanyUserById(order.getCompanyUserId());
             if (companyUser != null) {
                 CompanyDept dept = companyDeptService.selectCompanyDeptById(companyUser.getDeptId());
@@ -2467,6 +2468,9 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
     private BigDecimal handleDeliveryMoney(Long cityId, FsStoreProductScrm fsStoreProduct, String totalNumSize) {
         BigDecimal storePostage = BigDecimal.ZERO;
+        if (ObjectUtil.isNull(fsStoreProduct.getTempId())) {
+            return storePostage;
+        }
         List<Long> citys = new ArrayList<>();
         citys.add(cityId);
         citys.add(0l);
@@ -2979,7 +2983,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
         String orderId=redisCache.getCacheObject("isPaying:"+order.getOrderId());
         if(StringUtils.isNotEmpty(orderId)&&order.getOrderId().toString().equals(orderId)){
-            return R.error("正在支付中...");
+            return R.error(501,"正在支付中...");
         }
         FsUserScrm user=userMapper.selectFsUserById(Long.valueOf(order.getUserId()));
         if(user == null){
@@ -3487,6 +3491,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if (attrValue != null) {
             attrValue.setStock(attrValue.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
             attrValue.setSales(attrValue.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
+            fsStoreProductAttrValueMapper.updateFsStoreProductAttrValue(attrValue);
         } else {
             // 更改店铺库存
             fsStoreProduct.setStock(fsStoreProduct.getStock()-Integer.parseInt(liveOrder.getTotalNum()));
@@ -3513,6 +3518,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setCompanyUserId(liveUserFirstEntry.getCompanyUserId());
         liveOrder.setTuiUserId(liveUserFirstEntry.getCompanyUserId());
         String orderSn = OrderCodeUtils.getOrderSn();
+//        String orderSn = "123"; // todo yhq
         log.info("订单生成："+orderSn);
         liveOrder.setOrderCode(orderSn);
         BigDecimal payPrice = fsStoreProduct.getPrice().multiply(new BigDecimal(liveOrder.getTotalNum()));
@@ -3561,7 +3567,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setPayType("1");
         liveOrder.setTotalPrice(payPrice);
         liveOrder.setPayMoney(BigDecimal.ZERO);
-        liveOrder.setPayPrice(payPrice);
+        liveOrder.setPayPrice(payPrice.subtract(liveOrder.getDiscountMoney()));
         try {
             if (baseMapper.insertLiveOrder(liveOrder) > 0) {
                 LiveOrderItemDTO dto=new LiveOrderItemDTO();

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

@@ -78,6 +78,18 @@ public interface QwTagGroupMapper
             "</script>"})
     List<QwTagGroupListVO> selectQwTagGroupListVO(QwTagGroup qwTagGroup);
 
+    @Select({"<script> " +
+            "select * from qw_tag_group "+
+            "<where>\n" +
+            "            <if test=\"groupId != null  and groupId != ''\"> and group_id = #{groupId}</if>\n" +
+            "            <if test=\"name != null  and name != ''\"> and name like concat( '%',#{name}, '%')</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" +
+            "        </where> order by `order` desc ,id desc"+
+            "</script>"})
+    List<QwTagGroupListVO> selectQwTagGroupListVOPage(QwTagGroup qwTagGroup);
+
     @Select("select * from qw_tag_group where id=#{id}")
     QwTagGroupVO selectQwTagGroupByIdVO(Long id);
 

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

@@ -9,4 +9,10 @@ public class QwExternalContactAddTagParam {
     List<Long> userIds;
     List<String> tagIds;
     String corpId;
+    /**
+     * 指筛选条件  我的，部门，还是全部
+     */
+    private Integer addType;
+    private boolean filter;
+    private QwExternalContactParam param;
 }

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

@@ -1,5 +1,6 @@
 package com.fs.qw.param;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
 
@@ -17,4 +18,11 @@ public class QwTagParam  {
      * 公司id
      */
     private Long companyId;
+
+    @TableField(exist = false)
+    private Integer pageNum = 1;
+
+    @TableField(exist = false)
+    private Integer pageSize = 10;
+
 }

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

@@ -87,4 +87,6 @@ public interface IQwTagGroupService
     void addQwTagByAi(String trimTag, Long extId);
 
     void delQwTagByAi(String trimTag, Long extId);
+
+    List<QwTagGroupListVO> selectQwTagGroupListVOPage(QwTagGroup qwTagGroup);
 }

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

@@ -636,4 +636,18 @@ public class QwTagGroupServiceImpl implements IQwTagGroupService {
         }
 
     }
+
+    @Override
+    public List<QwTagGroupListVO> selectQwTagGroupListVOPage(QwTagGroup qwTagGroup) {
+        List<QwTagGroupListVO> vo = qwTagGroupMapper.selectQwTagGroupListVOPage(qwTagGroup);
+
+        for (QwTagGroupListVO qwTagGroupListVO : vo) {
+            QwTag qwTag = new QwTag();
+            qwTag.setGroupId(qwTagGroupListVO.getGroupId());
+            qwTag.setCompanyId(qwTagGroupListVO.getCompanyId());
+            List<QwTagVO> qwTags = qwTagMapper.selectQwTagListVO(qwTag);
+            qwTagGroupListVO.setTag(qwTags);
+        }
+        return vo;
+    }
 }

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

@@ -95,12 +95,16 @@ public class QwExternalContactVO {
     private Long companyId;
 
     private Integer transferStatus;
+    /*状态名称 用于excel导出*/
+    @Excel(name = "状态")
+    private String statusName;
     private Integer status;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "添加时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "流失时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date lossTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date delTime;

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

@@ -161,6 +161,10 @@ public class QwSop implements Serializable
     @TableField(exist = false)
     private List<String> userIds = new ArrayList<>();
 
+
+    private Integer pageNum;
+    private Integer pageSize;
+
     public List<String> getUserIds() {
         if (userIds == null || userIds.isEmpty()) {
             return userIds;

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

@@ -114,6 +114,8 @@ public class QwSopTemp implements Serializable
     @TableField(exist = false)
     private List<String> companyUserIds=new ArrayList<>();
 
+    private Integer pageNum;
+    private Integer pageSize;
 
     public List<String> getCompanyUserIds() {
         if (companyUserIds == null || companyUserIds.isEmpty()) {

fs-service/src/main/java/com/fs/system/mapper/SysUserMapper.java

@@ -130,4 +130,6 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+    List<SysUser> selectUserByPhone(String phone);
 }

fs-service/src/main/java/com/fs/system/service/ISysUserService.java

@@ -214,4 +214,6 @@ public interface ISysUserService
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
     int updateUserInfo(SysUser sysuser);
+
+    List<SysUser> selectUserByPhone(String phone);
 }

fs-service/src/main/java/com/fs/system/service/impl/SysUserServiceImpl.java

@@ -586,4 +586,8 @@ public class SysUserServiceImpl implements ISysUserService
     public int updateUserInfo(SysUser sysuser) {
         return userMapper.updateUser(sysuser);
     }
+
+    public List<SysUser> selectUserByPhone(String phone) {
+        return userMapper.selectUserByPhone(phone);
+    }
 }

fs-service/src/main/java/com/fs/wxcid/dto/admin/GenAuthKey3Request.java

@@ -5,9 +5,11 @@ import lombok.Data;
 
 @Data
 public class GenAuthKey3Request {
+    //要生成 AuthKey 的个数; Count小于1默认设置为1
     @JsonProperty("Count")
     private Integer Count;
 
+    //类型 1日 7 周 30月 90季 180 半年 365年 30000永久（数字为标识，非准确天数）
     @JsonProperty("Type")
     private Integer Type;
 }

fs-service/src/main/java/com/fs/wxcid/service/FriendService.java

@@ -10,7 +10,7 @@ import com.fs.wxcid.dto.friend.*;
  * <p>
  * 本接口封装了微信私有协议中 /friend 路径下的所有好友相关操作，
  * 包括：添加/同意好友、删除好友、查询联系人、搜索、上传通讯录等。
- * 所有方法均需传入账号唯一标识 key，并返回统一格式的 ApiResponse。
+ * 所有方法均需传入账号唯一标识 authKey，并返回统一格式的 ApiResponse。
  * </p>
  */
 public interface FriendService {
@@ -22,11 +22,11 @@ public interface FriendService {
      * 通常用于处理来自他人的加好友申请，需提供 V3/V4 等加密参数。
      * </p>
      *
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 同意请求参数（包含 V3、V4、Scene 等）
      * @return 统一响应结果
      */
-    ApiResponse agreeAdd(String key, AgreeAddRequest request);
+    ApiResponse agreeAdd(String authKey, AgreeAddRequest request);
 
     /**
      * 删除好友
@@ -35,11 +35,11 @@ public interface FriendService {
      * 从联系人列表中移除指定用户。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 删除请求参数（含 DelUserName）
      * @return 统一响应结果
      */
-    ApiResponse delContact(String key, DelContactRequest request);
+    ApiResponse delContact(String authKey, DelContactRequest request);
 
     /**
      * 批量获取联系人详细信息
@@ -48,11 +48,11 @@ public interface FriendService {
      * 可同时查询多个用户或群聊的详细资料。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 查询参数（支持 UserNames 和 RoomWxIDList）
      * @return 统一响应结果
      */
-    ApiResponse getContactDetailsList(String key, GetContactDetailsListRequest request);
+    ApiResponse getContactDetailsList(String authKey, GetContactDetailsListRequest request);
 
     /**
      * 分页获取全部联系人（包括好友和群聊）
@@ -61,11 +61,11 @@ public interface FriendService {
      * 通过序列号实现分页加载，避免一次性拉取过多数据。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 分页参数（CurrentWxcontactSeq / CurrentChatRoomContactSeq）
      * @return 统一响应结果
      */
-    ApiResponse getContactList(String key, GetContactListRequest request);
+    ApiResponse getContactList(String authKey, GetContactListRequest request);
 
     /**
      * 查询与指定用户的好友关系状态
@@ -74,11 +74,11 @@ public interface FriendService {
      * 可判断是否为单向/双向好友、是否被拉黑等。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 目标用户名（UserName）
      * @return 统一响应结果（含关系状态码）
      */
-    ApiResponse getFriendRelation(String key, GetFriendRelationRequest request);
+    ApiResponse getFriendRelation(String authKey, GetFriendRelationRequest request);
 
     /**
      * 获取已关注的公众号列表
@@ -87,10 +87,10 @@ public interface FriendService {
      * 返回当前账号关注的所有公众号信息。
      * </p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponse getGHList(String key);
+    ApiResponse getGHList(String authKey);
 
     /**
      * 获取手机通讯录中匹配的微信好友
@@ -99,10 +99,10 @@ public interface FriendService {
      * 需提前上传通讯录（UploadMContact），否则可能返回空。
      * </p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponse getMFriend(String key);
+    ApiResponse getMFriend(String authKey);
 
     /**
      * 获取已保存的群聊列表
@@ -111,10 +111,10 @@ public interface FriendService {
      * 返回当前账号参与并保存的所有群聊。
      * </p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponse getGroupList(String key);
+    ApiResponse getGroupList(String authKey);
 
     /**
      * 搜索联系人
@@ -123,11 +123,11 @@ public interface FriendService {
      * 支持按昵称、微信号、手机号等模糊搜索。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 搜索参数（UserName + 场景配置）
      * @return 统一响应结果
      */
-    ApiResponse searchContact(String key, SearchContactRequest request);
+    ApiResponse searchContact(String authKey, SearchContactRequest request);
 
     /**
      * 上传手机通讯录用于匹配微信好友
@@ -136,11 +136,11 @@ public interface FriendService {
      * 上传后可调用 GetMFriend 获取匹配结果。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 通讯录号码列表（MobileList）
      * @return 统一响应结果
      */
-    ApiResponse uploadMContact(String key, UploadMContactRequest request);
+    ApiResponse uploadMContact(String authKey, UploadMContactRequest request);
 
     /**
      * 发起好友验证或添加请求
@@ -150,9 +150,9 @@ public interface FriendService {
      * 若无 V3/V4，部分场景可能无法添加。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 添加请求参数（含 V3、V4、Scene、验证语等）
      * @return 统一响应结果
      */
-    ApiResponse verifyUser(String key, VerifyUserRequest request);
+    ApiResponse verifyUser(String authKey, VerifyUserRequest request);
 }

fs-service/src/main/java/com/fs/wxcid/service/LoginService.java

@@ -12,28 +12,28 @@ import com.fs.wxcid.dto.login.VerifyCodeRequest;
 public interface LoginService {
 
     // —————— 账号密码 / 62 / A16 登录 ——————
-    ApiResponse a16Login(String key, LoginRequest request);
-    ApiResponse deviceLogin(String key, LoginRequest request);
+    ApiResponse a16Login(String authKey, LoginRequest request);
+    ApiResponse deviceLogin(String authKey, LoginRequest request);
 
     // —————— 二维码登录（iPad / Mac / 车载） ——————
-    ApiResponse getLoginQrCodeNew(String key, QrCodeRequest request);// iPad
-    ApiResponse getLoginQrCodeNewDirect(String key, QrCodeRequest request); // 直登
-    ApiResponse macLogin(String key, QrCodeRequest request);// Mac
-    ApiResponse carLogin(String key, QrCodeRequest request);// iPad
+    ApiResponse getLoginQrCodeNew(String authKey, QrCodeRequest request);// iPad
+    ApiResponse getLoginQrCodeNewDirect(String authKey, QrCodeRequest request); // 直登
+    ApiResponse macLogin(String authKey, QrCodeRequest request);// Mac
+    ApiResponse carLogin(String authKey, QrCodeRequest request);// iPad
 
     // ------------------ 状态检测 ------------------
-    ApiResponse checkCanSetAlias(String key);// 检测是否可设昵称（判断登录环境）
-    ApiResponse checkLoginStatus(String key);// 检测扫码是否完成
-    ApiResponse getLoginStatus(String key);// 获取当前在线状态
+    ApiResponse checkCanSetAlias(String authKey);// 检测是否可设昵称（判断登录环境）
+    ApiResponse checkLoginStatus(String authKey);// 检测扫码是否完成
+    ApiResponse getLoginStatus(String authKey);// 获取当前在线状态
 
     // —————— 数据管理 ——————
-    ApiResponse get62Data(String key);            // 提取 62 数据（用于免密登录）
+    ApiResponse get62Data(String authKey);            // 提取 62 数据（用于免密登录）
 
     // —————— 验证码与滑块 ——————
-    ApiResponse verifyCode(String key, VerifyCodeRequest request);
-    ApiResponse verifyCodeSlide(String key, SlideVerifyRequest request);
+    ApiResponse verifyCode(String authKey, VerifyCodeRequest request);
+    ApiResponse verifyCodeSlide(String authKey, SlideVerifyRequest request);
 
     // —————— 控制 ——————
-    ApiResponse wakeUpLogin(String key, QrCodeRequest request); // 唤醒扫码登录
-    ApiResponse logOut(String key);                // 退出登录
+    ApiResponse wakeUpLogin(String authKey, QrCodeRequest request); // 唤醒扫码登录
+    ApiResponse logOut(String authKey);                // 退出登录
 }

fs-service/src/main/java/com/fs/wxcid/service/MessageCallbackService.java

@@ -20,28 +20,28 @@ public interface MessageCallbackService {
      * 设置消息回调地址并启用/禁用推送
      * <p>对应接口：POST /message/SetCallback</p>
      *
-     * @param key     账号唯一标识
+     * @param authKey     账号唯一标识
      * @param config 回调配置（URL + 启用状态）
      * @return 统一响应结果
      */
-    ApiResponse setCallback(String key, CallbackConfigRequest config);
+    ApiResponse setCallback(String authKey, CallbackConfigRequest config);
 
     /**
      * 获取当前账号的消息回调配置
      * <p>对应接口：GET /message/GetCallback</p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 包含 CallbackURL 和 Enabled 状态的响应
      */
-    ApiResponse getCallback(String key);
+    ApiResponse getCallback(String authKey);
 
     /**
      * 删除（清空）消息回调配置
      * <p>执行后将不再推送任何消息到原回调地址</p>
      * <p>对应接口：GET /message/DeleteCallback</p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 操作结果
      */
-    ApiResponse deleteCallback(String key);
+    ApiResponse deleteCallback(String authKey);
 }

fs-service/src/main/java/com/fs/wxcid/service/MessageService.java

@@ -7,26 +7,26 @@ import com.fs.wxcid.dto.message.*;
 
 public interface MessageService {
 
-    ApiResponse addMessageMgr(String key, AddMessageMgrRequest request);
-    ApiResponse cdnUploadVideo(String key, CdnUploadVideoRequest request);
-    ApiResponse downloadEmojiGif(String key, DownloadEmojiGifRequest request);
-    ApiResponse forwardEmoji(String key, ForwardEmojiRequest request);
-    ApiResponse forwardImageMessage(String key, ForwardImageMessageRequest request);
-    ApiResponse forwardVideoMessage(String key, ForwardVideoMessageRequest request);
-    ApiResponse getMsgBigImg(String key, GetMsgBigImgRequest request);
-    ApiResponse getMsgVideo(String key, GetMsgVideoRequest request);
-    ApiResponse getMsgVoice(String key, GetMsgVoiceRequest request);
-    ApiResponse groupMassMsgImage(String key, GroupMassMsgImageRequest request);
-    ApiResponse groupMassMsgText(String key, GroupMassMsgTextRequest request);
-    ApiResponse httpSyncMsg(String key, HttpSyncMsgRequest request);
-    ApiResponse newSyncHistoryMessage(String key); // 无 body
-    ApiResponse revokeMsg(String key, RevokeMsgRequest request);
-    ApiResponse revokeMsgNew(String key, RevokeMsgNewRequest request);
-    ApiResponse sendAppMessage(String key, SendAppMessageRequest request);
-    ApiResponse sendEmojiMessage(String key, SendEmojiMessageRequest request);
-    ApiResponse sendImageMessage(String key, SendImageMessageRequest request);
-    ApiResponse sendImageNewMessage(String key, SendImageNewMessageRequest request);
-    ApiResponse sendTextMessage(String key, SendTextMessageRequest request);
-    ApiResponse sendVoice(String key, SendVoiceRequest request);
-    ApiResponse shareCardMessage(String key, ShareCardMessageRequest request);
+    ApiResponse addMessageMgr(String authKey, AddMessageMgrRequest request);
+    ApiResponse cdnUploadVideo(String authKey, CdnUploadVideoRequest request);
+    ApiResponse downloadEmojiGif(String authKey, DownloadEmojiGifRequest request);
+    ApiResponse forwardEmoji(String authKey, ForwardEmojiRequest request);
+    ApiResponse forwardImageMessage(String authKey, ForwardImageMessageRequest request);
+    ApiResponse forwardVideoMessage(String authKey, ForwardVideoMessageRequest request);
+    ApiResponse getMsgBigImg(String authKey, GetMsgBigImgRequest request);
+    ApiResponse getMsgVideo(String authKey, GetMsgVideoRequest request);
+    ApiResponse getMsgVoice(String authKey, GetMsgVoiceRequest request);
+    ApiResponse groupMassMsgImage(String authKey, GroupMassMsgImageRequest request);
+    ApiResponse groupMassMsgText(String authKey, GroupMassMsgTextRequest request);
+    ApiResponse httpSyncMsg(String authKey, HttpSyncMsgRequest request);
+    ApiResponse newSyncHistoryMessage(String authKey); // 无 body
+    ApiResponse revokeMsg(String authKey, RevokeMsgRequest request);
+    ApiResponse revokeMsgNew(String authKey, RevokeMsgNewRequest request);
+    ApiResponse sendAppMessage(String authKey, SendAppMessageRequest request);
+    ApiResponse sendEmojiMessage(String authKey, SendEmojiMessageRequest request);
+    ApiResponse sendImageMessage(String authKey, SendImageMessageRequest request);
+    ApiResponse sendImageNewMessage(String authKey, SendImageNewMessageRequest request);
+    ApiResponse sendTextMessage(String authKey, SendTextMessageRequest request);
+    ApiResponse sendVoice(String authKey, SendVoiceRequest request);
+    ApiResponse shareCardMessage(String authKey, ShareCardMessageRequest request);
 }

fs-service/src/main/java/com/fs/wxcid/service/impl/FriendServiceImpl.java

@@ -22,58 +22,58 @@ public class FriendServiceImpl implements FriendService {
 
 
     @Override
-    public ApiResponse agreeAdd(String key, AgreeAddRequest request) {
-        return post("/friend/AgreeAdd", key, request);
+    public ApiResponse agreeAdd(String authKey, AgreeAddRequest request) {
+        return post("/friend/AgreeAdd", authKey, request);
     }
 
     @Override
-    public ApiResponse delContact(String key, DelContactRequest request) {
-        return post("/friend/DelContact", key, request);
+    public ApiResponse delContact(String authKey, DelContactRequest request) {
+        return post("/friend/DelContact", authKey, request);
     }
 
     @Override
-    public ApiResponse getContactDetailsList(String key, GetContactDetailsListRequest request) {
-        return post("/friend/GetContactDetailsList", key, request);
+    public ApiResponse getContactDetailsList(String authKey, GetContactDetailsListRequest request) {
+        return post("/friend/GetContactDetailsList", authKey, request);
     }
 
     @Override
-    public ApiResponse getContactList(String key, GetContactListRequest request) {
-        return post("/friend/GetContactList", key, request);
+    public ApiResponse getContactList(String authKey, GetContactListRequest request) {
+        return post("/friend/GetContactList", authKey, request);
     }
 
     @Override
-    public ApiResponse getFriendRelation(String key, GetFriendRelationRequest request) {
-        return post("/friend/GetFriendRelation", key, request);
+    public ApiResponse getFriendRelation(String authKey, GetFriendRelationRequest request) {
+        return post("/friend/GetFriendRelation", authKey, request);
     }
 
     @Override
-    public ApiResponse getGHList(String key) {
-        return get("/friend/GetGHList", key);
+    public ApiResponse getGHList(String authKey) {
+        return get("/friend/GetGHList", authKey);
     }
 
     @Override
-    public ApiResponse getMFriend(String key) {
-        return get("/friend/GetMFriend", key);
+    public ApiResponse getMFriend(String authKey) {
+        return get("/friend/GetMFriend", authKey);
     }
 
     @Override
-    public ApiResponse getGroupList(String key) {
-        return get("/friend/GroupList", key);
+    public ApiResponse getGroupList(String authKey) {
+        return get("/friend/GroupList", authKey);
     }
 
     @Override
-    public ApiResponse searchContact(String key, SearchContactRequest request) {
-        return post("/friend/SearchContact", key, request);
+    public ApiResponse searchContact(String authKey, SearchContactRequest request) {
+        return post("/friend/SearchContact", authKey, request);
     }
 
     @Override
-    public ApiResponse uploadMContact(String key, UploadMContactRequest request) {
-        return post("/friend/UploadMContact", key, request);
+    public ApiResponse uploadMContact(String authKey, UploadMContactRequest request) {
+        return post("/friend/UploadMContact", authKey, request);
     }
 
     @Override
-    public ApiResponse verifyUser(String key, VerifyUserRequest request) {
-        return post("/friend/VerifyUser", key, request);
+    public ApiResponse verifyUser(String authKey, VerifyUserRequest request) {
+        return post("/friend/VerifyUser", authKey, request);
     }
 
     // ------------------ 工具方法 ------------------
@@ -81,12 +81,12 @@ public class FriendServiceImpl implements FriendService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -94,13 +94,13 @@ public class FriendServiceImpl implements FriendService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/java/com/fs/wxcid/service/impl/LoginServiceImpl.java

@@ -20,66 +20,66 @@ public class LoginServiceImpl implements LoginService {
 
     // ------------------ 账号密码登录 ------------------
 
-    public ApiResponse a16Login(String key, LoginRequest request) {
-        return post("/login/A16Login", key, request);
+    public ApiResponse a16Login(String authKey, LoginRequest request) {
+        return post("/login/A16Login", authKey, request);
     }
 
-    public ApiResponse deviceLogin(String key, LoginRequest request) {
-        return post("/login/DeviceLogin", key, request);
+    public ApiResponse deviceLogin(String authKey, LoginRequest request) {
+        return post("/login/DeviceLogin", authKey, request);
     }
 
     // ------------------ 二维码登录 ------------------
 
-    public ApiResponse getLoginQrCodeNew(String key, QrCodeRequest request) {
-        return post("/login/GetLoginQrCodeNew", key, request);
+    public ApiResponse getLoginQrCodeNew(String authKey, QrCodeRequest request) {
+        return post("/login/GetLoginQrCodeNew", authKey, request);
     }
 
-    public ApiResponse getLoginQrCodeNewDirect(String key, QrCodeRequest request) {
-        return post("/login/GetLoginQrCodeNewDirect", key, request);
+    public ApiResponse getLoginQrCodeNewDirect(String authKey, QrCodeRequest request) {
+        return post("/login/GetLoginQrCodeNewDirect", authKey, request);
     }
 
-    public ApiResponse macLogin(String key, QrCodeRequest request) {
-        return post("/login/MacLogin", key, request);
+    public ApiResponse macLogin(String authKey, QrCodeRequest request) {
+        return post("/login/MacLogin", authKey, request);
     }
 
-    public ApiResponse carLogin(String key, QrCodeRequest request) {
-        return post("/login/CarLogin", key, request);
+    public ApiResponse carLogin(String authKey, QrCodeRequest request) {
+        return post("/login/CarLogin", authKey, request);
     }
 
-    public ApiResponse wakeUpLogin(String key, QrCodeRequest request) {
-        return post("/login/WakeUpLogin", key, request);
+    public ApiResponse wakeUpLogin(String authKey, QrCodeRequest request) {
+        return post("/login/WakeUpLogin", authKey, request);
     }
 
     // ------------------ 状态检测 ------------------
 
-    public ApiResponse checkCanSetAlias(String key) {
-        return get("/login/CheckCanSetAlias", key);
+    public ApiResponse checkCanSetAlias(String authKey) {
+        return get("/login/CheckCanSetAlias", authKey);
     }
 
-    public ApiResponse checkLoginStatus(String key) {
-        return get("/login/CheckLoginStatus", key);
+    public ApiResponse checkLoginStatus(String authKey) {
+        return get("/login/CheckLoginStatus", authKey);
     }
 
-    public ApiResponse getLoginStatus(String key) {
-        return get("/login/GetLoginStatus", key);
+    public ApiResponse getLoginStatus(String authKey) {
+        return get("/login/GetLoginStatus", authKey);
     }
 
-    public ApiResponse get62Data(String key) {
-        return get("/login/Get62Data", key);
+    public ApiResponse get62Data(String authKey) {
+        return get("/login/Get62Data", authKey);
     }
 
-    public ApiResponse logOut(String key) {
-        return get("/login/LogOut", key);
+    public ApiResponse logOut(String authKey) {
+        return get("/login/LogOut", authKey);
     }
 
     // ------------------ 验证 ------------------
 
-    public ApiResponse verifyCode(String key, VerifyCodeRequest request) {
-        return post("/login/VerifyCode", key, request);
+    public ApiResponse verifyCode(String authKey, VerifyCodeRequest request) {
+        return post("/login/VerifyCode", authKey, request);
     }
 
-    public ApiResponse verifyCodeSlide(String key, SlideVerifyRequest request) {
-        return post("/login/VerifyCodeSlide", key, request);
+    public ApiResponse verifyCodeSlide(String authKey, SlideVerifyRequest request) {
+        return post("/login/VerifyCodeSlide", authKey, request);
     }
 
     // ------------------ 工具方法 ------------------
@@ -87,12 +87,12 @@ public class LoginServiceImpl implements LoginService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -100,13 +100,13 @@ public class LoginServiceImpl implements LoginService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/java/com/fs/wxcid/service/impl/MessageCallbackServiceImpl.java

@@ -20,8 +20,8 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
 
     @Override
     public ReturnMessage returnMessage(Map<String, Object> callback) {
-        // 安全地获取 key
-        String key = (String) callback.get("key");
+        // 安全地获取 authKey
+        String authKey = (String) callback.get("authKey");
 
         // 获取 message 子对象（也是一个 Map）
         Map<String, Object> message = (Map<String, Object>) callback.get("message");
@@ -45,22 +45,22 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
     /**
      * 设置消息回调
      */
-    public ApiResponse setCallback(String key, CallbackConfigRequest config) {
-        return post("/message/SetCallback", key, config);
+    public ApiResponse setCallback(String authKey, CallbackConfigRequest config) {
+        return post("/message/SetCallback", authKey, config);
     }
 
     /**
      * 获取消息回调配置
      */
-    public ApiResponse getCallback(String key) {
-        return get("/message/GetCallback", key);
+    public ApiResponse getCallback(String authKey) {
+        return get("/message/GetCallback", authKey);
     }
 
     /**
      * 删除消息回调配置
      */
-    public ApiResponse deleteCallback(String key) {
-        return get("/message/DeleteCallback", key);
+    public ApiResponse deleteCallback(String authKey) {
+        return get("/message/DeleteCallback", authKey);
     }
 
 
@@ -69,12 +69,12 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -82,13 +82,13 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/java/com/fs/wxcid/service/impl/MessageServiceImpl.java

@@ -18,113 +18,113 @@ public class MessageServiceImpl implements MessageService {
 
 
     @Override
-    public ApiResponse addMessageMgr(String key, AddMessageMgrRequest request) {
-        return post("/message/AddMessageMgr", key, request);
+    public ApiResponse addMessageMgr(String authKey, AddMessageMgrRequest request) {
+        return post("/message/AddMessageMgr", authKey, request);
     }
 
     @Override
-    public ApiResponse cdnUploadVideo(String key, CdnUploadVideoRequest request) {
-        return post("/message/CdnUploadVideo", key, request);
+    public ApiResponse cdnUploadVideo(String authKey, CdnUploadVideoRequest request) {
+        return post("/message/CdnUploadVideo", authKey, request);
     }
 
     @Override
-    public ApiResponse downloadEmojiGif(String key, DownloadEmojiGifRequest request) {
-        return post("/message/DownloadEmojiGif", key, request);
+    public ApiResponse downloadEmojiGif(String authKey, DownloadEmojiGifRequest request) {
+        return post("/message/DownloadEmojiGif", authKey, request);
     }
 
     @Override
-    public ApiResponse forwardEmoji(String key, ForwardEmojiRequest request) {
-        return post("/message/ForwardEmoji", key, request);
+    public ApiResponse forwardEmoji(String authKey, ForwardEmojiRequest request) {
+        return post("/message/ForwardEmoji", authKey, request);
     }
 
     @Override
-    public ApiResponse forwardImageMessage(String key, ForwardImageMessageRequest request) {
-        return post("/message/ForwardImageMessage", key, request);
+    public ApiResponse forwardImageMessage(String authKey, ForwardImageMessageRequest request) {
+        return post("/message/ForwardImageMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse forwardVideoMessage(String key, ForwardVideoMessageRequest request) {
-        return post("/message/ForwardVideoMessage", key, request);
+    public ApiResponse forwardVideoMessage(String authKey, ForwardVideoMessageRequest request) {
+        return post("/message/ForwardVideoMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse getMsgBigImg(String key, GetMsgBigImgRequest request) {
-        return post("/message/GetMsgBigImg", key, request);
+    public ApiResponse getMsgBigImg(String authKey, GetMsgBigImgRequest request) {
+        return post("/message/GetMsgBigImg", authKey, request);
     }
 
     @Override
-    public ApiResponse getMsgVideo(String key, GetMsgVideoRequest request) {
-        return post("/message/GetMsgVideo", key, request);
+    public ApiResponse getMsgVideo(String authKey, GetMsgVideoRequest request) {
+        return post("/message/GetMsgVideo", authKey, request);
     }
 
     @Override
-    public ApiResponse getMsgVoice(String key, GetMsgVoiceRequest request) {
-        return post("/message/GetMsgVoice", key, request);
+    public ApiResponse getMsgVoice(String authKey, GetMsgVoiceRequest request) {
+        return post("/message/GetMsgVoice", authKey, request);
     }
 
     @Override
-    public ApiResponse groupMassMsgImage(String key, GroupMassMsgImageRequest request) {
-        return post("/message/GroupMassMsgImage", key, request);
+    public ApiResponse groupMassMsgImage(String authKey, GroupMassMsgImageRequest request) {
+        return post("/message/GroupMassMsgImage", authKey, request);
     }
 
     @Override
-    public ApiResponse groupMassMsgText(String key, GroupMassMsgTextRequest request) {
-        return post("/message/GroupMassMsgText", key, request);
+    public ApiResponse groupMassMsgText(String authKey, GroupMassMsgTextRequest request) {
+        return post("/message/GroupMassMsgText", authKey, request);
     }
 
     @Override
-    public ApiResponse httpSyncMsg(String key, HttpSyncMsgRequest request) {
-        return post("/message/HttpSyncMsg", key, request);
+    public ApiResponse httpSyncMsg(String authKey, HttpSyncMsgRequest request) {
+        return post("/message/HttpSyncMsg", authKey, request);
     }
 
     @Override
-    public ApiResponse newSyncHistoryMessage(String key) {
-        return post("/message/NewSyncHistoryMessage", key, new Object()); // 无 body，传空对象或自定义
+    public ApiResponse newSyncHistoryMessage(String authKey) {
+        return post("/message/NewSyncHistoryMessage", authKey, new Object()); // 无 body，传空对象或自定义
     }
 
     @Override
-    public ApiResponse revokeMsg(String key, RevokeMsgRequest request) {
-        return post("/message/RevokeMsg", key, request);
+    public ApiResponse revokeMsg(String authKey, RevokeMsgRequest request) {
+        return post("/message/RevokeMsg", authKey, request);
     }
 
     @Override
-    public ApiResponse revokeMsgNew(String key, RevokeMsgNewRequest request) {
-        return post("/message/RevokeMsgNew", key, request);
+    public ApiResponse revokeMsgNew(String authKey, RevokeMsgNewRequest request) {
+        return post("/message/RevokeMsgNew", authKey, request);
     }
 
     @Override
-    public ApiResponse sendAppMessage(String key, SendAppMessageRequest request) {
-        return post("/message/SendAppMessage", key, request);
+    public ApiResponse sendAppMessage(String authKey, SendAppMessageRequest request) {
+        return post("/message/SendAppMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendEmojiMessage(String key, SendEmojiMessageRequest request) {
-        return post("/message/SendEmojiMessage", key, request);
+    public ApiResponse sendEmojiMessage(String authKey, SendEmojiMessageRequest request) {
+        return post("/message/SendEmojiMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendImageMessage(String key, SendImageMessageRequest request) {
-        return post("/message/SendImageMessage", key, request);
+    public ApiResponse sendImageMessage(String authKey, SendImageMessageRequest request) {
+        return post("/message/SendImageMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendImageNewMessage(String key, SendImageNewMessageRequest request) {
-        return post("/message/SendImageNewMessage", key, request);
+    public ApiResponse sendImageNewMessage(String authKey, SendImageNewMessageRequest request) {
+        return post("/message/SendImageNewMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendTextMessage(String key, SendTextMessageRequest request) {
-        return post("/message/SendTextMessage", key, request);
+    public ApiResponse sendTextMessage(String authKey, SendTextMessageRequest request) {
+        return post("/message/SendTextMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendVoice(String key, SendVoiceRequest request) {
-        return post("/message/SendVoice", key, request);
+    public ApiResponse sendVoice(String authKey, SendVoiceRequest request) {
+        return post("/message/SendVoice", authKey, request);
     }
 
     @Override
-    public ApiResponse shareCardMessage(String key, ShareCardMessageRequest request) {
-        return post("/message/ShareCardMessage", key, request);
+    public ApiResponse shareCardMessage(String authKey, ShareCardMessageRequest request) {
+        return post("/message/ShareCardMessage", authKey, request);
     }
 
     // ------------------ 工具方法 ------------------
@@ -132,12 +132,12 @@ public class MessageServiceImpl implements MessageService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -145,13 +145,13 @@ public class MessageServiceImpl implements MessageService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/resources/application-common.yml

@@ -143,3 +143,12 @@ wechat:
   api:
     base-url: https://api.weixin.qq.com
     upload-shipping-info: /wxa/sec/order/upload_shipping_info
+  company:
+    appid: wxd7c1e221622a0ccf
+    secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+    redirectUri: http://rfa96c48.natappfree.cc/callback
+  admin:
+    appid: wxd7c1e221622a0ccf
+    secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+    redirectUri: http://rfa96c48.natappfree.cc/callback
+  isNeedScan: false

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

@@ -71,7 +71,7 @@ nuonuo:
 tencent_cloud_config:
   secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
   secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
-  bucket: bjzm-1323137866
+  bucket: bjzmky-1323137866
   app_id: 1323137866
   region: ap-chongqing
   proxy: bjzm

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

@@ -62,6 +62,12 @@ watch:
 fs :
   commonApi: http://172.26.180.67:7771
   h5CommonApi: http://172.26.180.67:7771
+  jwt:
+    # 加密秘钥
+    secret: f4e2e52034348f86b6d81e581c19jeb4
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

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

@@ -87,7 +87,7 @@ cloud_host:
 headerImg:
   imgUrl:
 ipad:
-  ipadUrl: http://ipad.dingdangtcm.cn
+  ipadUrl: http://175.178.218.55:8667
   aiApi: http://
   voiceApi: http://123.207.48.104:8009
   commonApi: http://123.207.48.104:7771

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

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isAllowedAllRegister"    column="is_allowed_all_register"    />
         <result property="doctorId"    column="doctor_id"    />
         <result property="bindCompanyUserId"    column="bind_company_user_id"    />
+        <result property="unionId"    column="union_id"    />
         <association property="dept"    column="dept_id" javaType="CompanyDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
     </resultMap>
@@ -315,6 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="domain != null">domain = #{domain},</if>
             <if test="isAudit != null">`is_audit` = #{isAudit},</if>
             <if test="doctorId != null">`doctor_id` = #{doctorId},</if>
+            <if test="unionId != null">`union_id` = #{unionId},</if>
         </trim>
         where user_id = #{userId}
     </update>
@@ -443,7 +445,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                u.create_time,u.id_card, u.remark,u.user_type,u.open_id,u.qr_code_weixin,u.qr_code_wecom,u.jpush_id,u.domain,u.is_audit,u.address_id,
                d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
                r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-               u.is_need_register_member, u.is_allowed_all_register,u.doctor_id
+               u.is_need_register_member, u.is_allowed_all_register,u.doctor_id,u.union_id
         from company_user u
                  left join company_dept d on u.dept_id = d.dept_id
                  left join company_user_role ur on u.user_id = ur.user_id

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

@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startDate != null and endDate != null">
                 and DATE_FORMAT(create_time, '%Y-%m-%d') between #{startDate} AND #{endDate}
             </if>
-            <if test='companyId !=null'>
+            <if test="companyId !=null">
                 and company_id = #{companyId}
             </if>
             <if test="courseId != null">

fs-service/src/main/resources/mapper/fastGpt/FastGptRoleMapper.xml

@@ -22,10 +22,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="contactInfo"    column="contact_info"    />
         <result property="channelType"    column="channel_type"    />
         <result property="logistics"    column="logistics"    />
+        <result property="forbidSendStart"    column="forbid_send_start"    />
+        <result property="forbidSendEnd"    column="forbid_send_end"    />
+        <result property="forbidStatus"    column="forbid_status"    />
     </resultMap>
 
     <sql id="selectFastGptRoleVo">
-        select role_id, role_name,contact_info,company_id, create_time, update_time, role_type, mode_config_json, mode, kf_id, kf_url, avatar, kf_media_id,reminder_words, bind_corp_id,channel_type,logistics from fastgpt_role
+        select role_id, role_name,contact_info,company_id, create_time, update_time, role_type, mode_config_json,
+               mode, kf_id, kf_url, avatar, kf_media_id,reminder_words, bind_corp_id,channel_type,logistics,forbid_send_start,
+               forbid_send_end,forbid_status
+        from fastgpt_role
     </sql>
 
     <select id="selectFastGptRoleList" parameterType="FastGptRole" resultMap="FastGptRoleResult">
@@ -136,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="contactInfo != null">contact_info = #{contactInfo},</if>
             <if test="channelType != null">channel_type = #{channelType},</if>
             <if test="logistics != null">logistics = #{logistics},</if>
+            <if test="forbidStatus != null">forbid_status = #{forbidStatus},</if>
         </trim>
         where role_id = #{roleId}
     </update>

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

@@ -97,6 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         1 = 1
         <!-- 订单编码精确查询 -->
         <if test="orderCode != null and orderCode != ''"> AND fio.order_code = #{orderCode} </if>
+        <if test="orderCodes != null and orderCodes.size >0">
+            AND fio.order_code in
+            <foreach collection="orderCodes" item="orderCode" open="(" close=")" separator=",">
+                #{orderCode}
+            </foreach>
+        </if>
         <!-- 用户名模糊查询 -->
         <if test="userName != null and userName != ''"> AND fio.user_name LIKE CONCAT('%', #{userName}, '%') </if>
         <!-- 用户手机号精确查询 -->

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

@@ -16,4 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             open_id     = VALUES(open_id),
             update_time = VALUES(update_time)
     </insert>
+
+    <select id="getFsUserWcByUserIdAndAppId" resultType="com.fs.his.domain.FsUserWx">
+        select * from fs_user_wx where fs_user_id = #{fsUserId} and app_id = #{appId} limit 1
+    </select>
 </mapper>

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

@@ -1309,7 +1309,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.appId != null and maps.appId != ''">
+        <if test="(maps.appId != null and maps.appId != '') or (maps.bankTransactionId != null and  maps.bankTransactionId !='')">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1456,7 +1456,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.appId != null and maps.appId != ''">
+        <if test="(maps.appId != null and maps.appId != '') or (maps.bankTransactionId != null and  maps.bankTransactionId !='')">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1466,6 +1466,9 @@ 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
         </if>
+        <if test = "maps.productName != null and  maps.productName !=  '' ">
+            left join fs_store_product_scrm fsp on fsp.product_id = soi.product_id
+        </if>
         <where>
             <if test="maps.appId != null and maps.appId != ''">
                 and csc.appid = #{maps.appId}
@@ -1730,9 +1733,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ${maps.params.dataScope}
-        <if test="maps.productName != null and  maps.productName !=  ''   ">
-            group by o.id
-        </if>
+<!--        <if test="maps.productName != null and  maps.productName !=  ''   ">-->
+<!--            group by o.id-->
+<!--        </if>-->
             order by
         <if test="maps.sortField == 'companyUserName'">
             cu.nick_name
@@ -1771,7 +1774,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.appId != null and maps.appId != ''">
+        <if test="(maps.appId != null and maps.appId != '') or (maps.bankTransactionId != null and  maps.bankTransactionId !='')">
             LEFT JOIN (
             SELECT
             sp.*,
@@ -1781,6 +1784,15 @@ 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
         </if>
+<!--        <if  test="maps.bankTransactionId != null and  maps.bankTransactionId !=''">-->
+<!--            LEFT JOIN (-->
+<!--            SELECT-->
+<!--            sp.*,-->
+<!--            ROW_NUMBER() OVER (PARTITION BY sp.business_code ORDER BY sp.create_time DESC) as rn-->
+<!--            FROM fs_store_payment_scrm sp-->
+<!--            WHERE sp.business_code IS NOT NULL-->
+<!--            ) sp_latest ON sp_latest.business_order_id = o.id AND sp_latest.rn = 1-->
+<!--        </if>-->
 
         <where>
             <if test="maps.appId != null and map.appId != ''">
@@ -1904,9 +1916,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         ${maps.params.dataScope}
-        <if test="maps.productName != null and  maps.productName !=  ''   ">
-            group by o.id
-        </if>
+<!--        <if test="maps.productName != null and  maps.productName !=  ''   ">-->
+<!--            group by o.id-->
+<!--        </if>-->
         order by o.id desc
     </select>
     <select id="selectAddTuiMoney" resultType="java.lang.Long">

fs-service/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -1026,6 +1026,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         <where>
             o.is_del = 0 and p.product_id IS NOT NULL
+            <if test="bankTransactionId != null and  bankTransactionId !=''">
+                and lop.bank_transaction_id like CONCAT('%',#{bankTransactionId},'%')
+            </if>
             <if test="orderId != null">
                 AND o.order_id = #{orderId}
             </if>

fs-service/src/main/resources/mapper/system/SysUserMapper.xml

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="updateTime"   column="update_time"  />
 		<result property="remark"       column="remark"       />
 		<result property="companyId"       column="company_id"       />
+		<result property="unionId"       column="union_id"       />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
 		<collection  property="roles"   javaType="java.util.List"        resultMap="RoleResult" />
 	</resultMap>
@@ -75,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.company_id
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,u.company_id,u.union_id
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id
@@ -247,7 +248,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select user_id, email from sys_user where email = #{email} limit 1
 	</select>
 
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+    <select id="selectUserByPhone" resultType="com.fs.common.core.domain.entity.SysUser">
+		<include refid="selectUserVo"/>
+		where u.phonenumber = #{phone}
+	</select>
+
+    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
@@ -298,6 +304,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="companyId != null">company_id = #{companyId},</if>
+ 			<if test="unionId != null">union_id = #{unionId},</if>
  			update_time = sysdate()
  		</set>
  		where user_id = #{userId}

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwLoginController.java

@@ -119,6 +119,7 @@ public class CourseQwLoginController extends AppBaseController {
             if(user != null){
                 FsUser userMap = new FsUser();
                 userMap.setUserId(user.getUserId());
+                userMap.setMaOpenId(session.getOpenid());
 //                userMap.setCourseMaOpenId(session.getOpenid());
                 userMap.setUpdateTime(new DateTime());
                 userService.updateFsUser(userMap);
@@ -129,6 +130,7 @@ public class CourseQwLoginController extends AppBaseController {
                 user.setNickName("微信用户");
                 user.setAvatar("https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230725/a848605591384ec29d49773dd58d9345.jpg");
                 user.setStatus(1);
+                user.setMaOpenId(session.getOpenid());
 //                user.setCourseMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());
                 user.setCreateTime(new Date());

fs-user-app/src/main/java/com/fs/app/controller/live/LiveAfterSalesController.java

@@ -6,6 +6,7 @@ import com.fs.app.controller.AppBaseController;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.ParseUtils;
+import com.fs.erp.service.FsJstAftersalePushScrmService;
 import com.fs.live.domain.LiveAfterSales;
 import com.fs.live.domain.LiveAfterSalesItem;
 import com.fs.live.domain.LiveOrder;

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

@@ -19,10 +19,14 @@ import com.fs.common.param.BaseQueryParam;
 import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.param.newfs.FsUserCourseBeMemberParam;
 import com.fs.course.service.IFsUserCourseVideoService;
+import com.fs.his.domain.FsUserWx;
+import com.fs.his.mapper.FsUserWxMapper;
+import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsUserBillScrm;
 import com.fs.hisStore.domain.FsUserPromoterApplyScrm;
 import com.fs.hisStore.domain.FsUserScrm;
+import com.fs.hisStore.enums.SysConfigEnum;
 import com.fs.hisStore.param.*;
 import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.*;
@@ -95,6 +99,11 @@ public class UserScrmController extends AppBaseController {
     @Autowired
     private ILiveOrderService liveOrderService;
 
+    @Autowired
+    private ConfigUtil configUtil;
+
+    @Autowired
+    FsUserWxMapper fsUserWxMapper;
     /**
      * 获取用户信息
      * @param request
@@ -103,6 +112,15 @@ public class UserScrmController extends AppBaseController {
     @ApiOperation("获取用户信息")
     @GetMapping("/getUserInfo")
     public R getUserInfo(HttpServletRequest request){
+
+        String queryAppId = null;
+        // 获取请求头中的 appid
+        String appid = request.getHeader("appid");
+        if(StringUtils.isNotEmpty(appid)){
+                queryAppId =  appid;
+        }else{
+            queryAppId = configUtil.generateConfigByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey()).getString("appid");
+        }
         try {
             FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
             if (user.getIsShow() !=null && user.getIsShow() == 0){
@@ -115,8 +133,16 @@ public class UserScrmController extends AppBaseController {
                         user.setIsShow(1);
                     }
                 }
-
             }
+            if( null != user && StringUtils.isBlank(user.getMaOpenId()) && null != user.getUserId() && null != queryAppId){
+                 log.info("用户没有maOpenId:{}",user);
+                 //从fsUserWx里面去进行查询数据
+                FsUserWx fsUserWx = fsUserWxMapper.getFsUserWcByUserIdAndAppId(user.getUserId(), queryAppId);
+                if(null != fsUserWx){
+                    user.setMaOpenId(fsUserWx.getOpenId());
+                }
+            }
+
             return R.ok().put("user",user);
         } catch (Exception e){
             log.error("【获取用户信息】：{}",e);

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

@@ -280,6 +280,7 @@ public class WxUserScrmController extends AppBaseController {
         final WxMaService wxService = WxMaConfiguration.getMaService(courseMa_appId);
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
+            logger.info("session 得到：{}" , session);
             // 解密
             WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
             FsUserScrm user=new FsUserScrm();
@@ -320,6 +321,7 @@ public class WxUserScrmController extends AppBaseController {
                     if (!updatedAppId.equals(checkPhone.getAppId())) {
                         userMap.setAppId(updatedAppId);
                     }
+                    logger.info("=====用户======:{}",updatedAppId);
                     userService.updateFsUser(userMap);
                 }
                 else{