循环依赖

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

@@ -3,10 +3,8 @@ package com.fs.course.service;
 import com.fs.common.core.domain.R;
 import com.fs.course.domain.FsCourseQuestionBank;
 import com.fs.course.dto.FsCourseQuestionBankImportDTO;
-import com.fs.course.dto.ImportResultDTO;
 import com.fs.course.param.FsCourseQuestionAnswerUParam;
 
-import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
@@ -74,7 +72,7 @@ public interface IFsCourseQuestionBankService
      * @param nickName 昵称
      * @return String
      */
-    ImportResultDTO importData(List<FsCourseQuestionBankImportDTO> list, String nickName, Long userId);
+    String importData(List<FsCourseQuestionBankImportDTO> list, String nickName, Long userId);
 
     /**
      * 根据ID查询题目

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

@@ -11,7 +11,6 @@ import com.fs.common.utils.StringUtils;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.dto.FsCourseQuestionBankImportDTO;
-import com.fs.course.dto.ImportResultDTO;
 import com.fs.course.mapper.*;
 import com.fs.course.param.FsCourseQuestionAnswerUParam;
 import com.fs.course.service.IFsCourseQuestionBankService;

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

@@ -28,10 +28,10 @@ import com.fs.his.mapper.FsUserMapper;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -53,17 +53,29 @@ import java.util.stream.Collectors;
  * @date 2025-04-16
  */
 @Service
-@AllArgsConstructor
 @Slf4j
 public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCoursePeriodDaysMapper, FsUserCoursePeriodDays> implements IFsUserCoursePeriodDaysService {
 
     private final FsUserCoursePeriodMapper fsUserCoursePeriodMapper;
-
     private final FsUserMapper fsUserMapper;
     private final SysConfigMapper sysConfigMapper;
-
     private final FsUserCoursePeriodDaysMapper fsUserCoursePeriodDaysMapper;
+    
+    @Lazy
     private final IFsUserCourseVideoService fsUserCourseVideoService;
+    
+    public FsUserCoursePeriodDaysServiceImpl(
+            FsUserCoursePeriodMapper fsUserCoursePeriodMapper,
+            FsUserMapper fsUserMapper,
+            SysConfigMapper sysConfigMapper,
+            FsUserCoursePeriodDaysMapper fsUserCoursePeriodDaysMapper,
+            @Lazy IFsUserCourseVideoService fsUserCourseVideoService) {
+        this.fsUserCoursePeriodMapper = fsUserCoursePeriodMapper;
+        this.fsUserMapper = fsUserMapper;
+        this.sysConfigMapper = sysConfigMapper;
+        this.fsUserCoursePeriodDaysMapper = fsUserCoursePeriodDaysMapper;
+        this.fsUserCourseVideoService = fsUserCourseVideoService;
+    }
 
     @Autowired
     private FsUserCourseVideoRedPackageMapper fsUserCourseVideoRedPackageMapper;

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

@@ -1415,21 +1415,5 @@ public interface FsStoreOrderScrmMapper
 
     @Select("select * from fs_store_order_scrm where  `status`=2 and (extend_order_id is not null and extend_order_id != '') and (delivery_id is not null and delivery_id != '')")
     List<FsStoreOrderScrm> selectShippedOrder();
-    /**
-     * 获取发货单数据
-     * @param maps 查询参数
-     * @return list
-     * **/
-    List<FsStoreOrderDeliveryNoteExportVO> getDeliveryNote(@Param("maps") FsStoreOrderParam maps);
-    /**
-     * 获取订单用户信息
-     * @param list 订单号
-     * @return lsit
-     * **/
-    List<FsStoreOrderCodeOpenIdVo> selectOrderCodeOpenIdInOrderCode(@Param("list") List<String> list);
-    /**
-     * 获取未结算订单
-     * **/
-    List<FsStoreOrderScrm> getUnsettledOrder();
 
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderScrmService.java

@@ -354,16 +354,9 @@ public interface IFsStoreOrderScrmService
 
     R receiveWaybillPush(String body);
 
-    /**
-     * 获取发货单数据
-     * @param param 查询条件
-     * @return list
-     * **/
-    List<FsStoreOrderDeliveryNoteExportVO> getDeliveryNote(FsStoreOrderParam param);
 
     R importDeliveryNoteExpress(List<FsOrderDeliveryNoteDTO> dtoList, String miniAppId);
 
-    void refreshOrderSettlementStatus();
 
     /**
      * 套餐包制单

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

@@ -43,10 +43,7 @@ import com.fs.company.domain.CompanyDept;
 import com.fs.company.domain.CompanyMoneyLogs;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.*;
-import com.fs.company.mapper.CompanyDeptMapper;
-import com.fs.company.mapper.CompanyMapper;
-import com.fs.company.mapper.CompanyMoneyLogsMapper;
-import com.fs.company.mapper.CompanyTagMapper;
+import com.fs.company.mapper.*;
 import com.fs.company.service.ICompanyDeptService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanyUserService;
@@ -400,6 +397,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     @Autowired
     private IFsStoreCartScrmService fsStoreCartScrmService;
 
+    @Autowired
+    private CompanyUserUserMapper companyUserUserMapper;
+
     @PostConstruct
     public void initErpServiceMap() {
         erpServiceMap = new HashMap<>();
@@ -4880,28 +4880,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
     }
 
-    private static final DateTimeFormatter CST_FORMATTER = DateTimeFormatter
-            .ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US)
-            .withZone(ZoneId.of("Asia/Shanghai"));
 
-    private static final DateTimeFormatter STANDARD_FORMATTER = DateTimeFormatter
-            .ofPattern("yyyy-MM-dd HH:mm:ss");
 
-    public static LocalDateTime parseCstToLocalDateTime(String cstDateStr) {
-        if (cstDateStr == null || cstDateStr.trim().isEmpty()) {
-            return null;
-        }
 
-        try {
-            // 解析为带时区的日期时间
-            ZonedDateTime zonedDateTime = ZonedDateTime.parse(cstDateStr, CST_FORMATTER);
-            // 转换为本地日期时间（忽略时区，仅保留年月日时分秒）
-            return zonedDateTime.toLocalDateTime();
-        } catch (DateTimeParseException e) {
-            System.err.println("日期解析失败: " + e.getMessage());
-            return null;
-        }
-    }
     @Override
     public List<FsStoreOrderVO> selectFsStoreOrderListVOByErpAccount(FsStoreOrderParam param) {
         List<FsStoreOrderVO> list = fsStoreOrderMapper.selectFsStoreOrderListVOByErpAccount(param);
@@ -5159,10 +5140,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         return null;
     }
 
-    @Override
-    public List<FsStoreOrderDeliveryNoteExportVO> getDeliveryNote(FsStoreOrderParam param) {
-        return fsStoreOrderMapper.getDeliveryNote(param);
-    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -5294,59 +5272,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
     }
 
-    @Override
-    @Transactional(rollbackFor = Throwable.class, propagation = Propagation.REQUIRED)
-    public void refreshOrderSettlementStatus() {
-        try {
-            // 判断是否对接微信发货
-            String json = configService.selectConfigByKey("store.config");
-            StoreConfig config = JSONUtil.toBean(json, StoreConfig.class);
-            logger.info("进入微信结算订单定时任务--------------->{}", "start");
-            if (config != null && config.getIsWeChatShipping() != null && config.getIsWeChatShipping()) {
-                // 获取未结算订单
-                List<FsStoreOrderScrm> orderScrmList = fsStoreOrderMapper.getUnsettledOrder();
 
-//                String payConfig = configService.selectConfigByKey("store.pay");
-                String payConfig = configService.selectConfigByKey("his.pay");
-                JSONObject js = JSON.parseObject(payConfig);
-                String appId = js.getString("appId");
-
-                if (ObjectUtil.isNotNull(appId) && !appId.isEmpty()) {
-                    final WxMaService wxService = WxMaConfiguration.getMaService(appId);
-
-                    if (!orderScrmList.isEmpty()) {
-                        for (FsStoreOrderScrm order : orderScrmList) {
-                            WxMaOrderShippingInfoGetRequest request = new WxMaOrderShippingInfoGetRequest();
-                            request.setTransactionId(order.getBankTransactionId());
-                            WxMaOrderShippingInfoGetResponse response;
-
-                            try {
-                                response = wxService.getWxMaOrderShippingService().get(request);
-
-                                if (response.getErrCode().equals(0)) {
-                                    // 订单状态枚举：(1) 待发货；(2) 已发货；(3) 确认收货；(4) 交易完成；(5) 已退款
-                                    if (response.getOrder().getOrderState().equals(3) || response.getOrder().getOrderState().equals(4)) {
-                                        if (order.getStatus() == OrderInfoEnum.STATUS_2.getValue()) {
-                                            this.finishOrder(order.getId());
-                                        }
-                                    }
-                                    logger.info("请求信息------------------------》{}", response);
-                                }
-
-                            } catch (WxErrorException e) {
-                                logger.info("异常信息------------------------》{}", e.getMessage());
-                                continue;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            e.getStackTrace();
-        } finally {
-            logger.info("进入微信结算订单定时任务--------------->{}", "end");
-        }
-    }
 
     private void batchUpdateDeliveryNotes(List<FsOrderDeliveryNoteDTO> list) {
         int batchSize = 500;

fs-service/src/main/java/com/fs/ipad/vo/BaseVo.java

@@ -16,7 +16,6 @@ public class BaseVo{
     private String corpCode;
     private Long qwUserId;
     private boolean isRoom;
-    private Long qwUserId;
 
     public void setBase(BaseVo vo){
         this.uuid = vo.getUuid();

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

@@ -259,5 +259,4 @@ public interface IQwExternalContactService extends IService<QwExternalContact> {
      * */
     QwExternalContact selectQwUserListVOByQwUserIdAndCorpIdAndExternalUserId(ExternalContactParam externalContactParam);
 
-    List<QwExternalContact> selectQwUserAndLevel(List<Long> qwUserIdList, List<String> levelList, boolean isReg);
 }

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

@@ -22,7 +22,6 @@ import com.fs.qw.service.ICustomerTransferApprovalService;
 import com.fs.qw.vo.TransferCustomDTO;
 import com.fs.store.service.cache.IFsUserCacheService;
 import lombok.extern.slf4j.Slf4j;
-import com.hc.openapi.tool.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.hc.core5.util.Asserts;

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

@@ -210,7 +210,7 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         for (QwWatchLogStatisticsListVO vo : vos) {
             Long id = vo.getId();
             Date createTime = vo.getCreateTime();
-            QwWatchLogStatisticsListVO stat = qwWatchLogMapper.selectQwWatchLogByQwUserId(id, createTime);
+            QwWatchLogStatisticsListVO stat = qwWatchLogMapper.selectQwExtCountByDayAndOther(id, createTime);
             vo.setD1Online(stat.getD1Online());
             vo.setD1Over(stat.getD1Over());
             vo.setFirstOnline(stat.getFirstOnline());
@@ -357,7 +357,7 @@ public class QwWatchLogServiceImpl extends ServiceImpl<QwWatchLogMapper, QwWatch
         for (QwWatchLogStatisticsListVO vo : vos) {
             Long id = vo.getId();
             Date createTime = vo.getCreateTime();
-            QwWatchLogStatisticsListVO stat = qwWatchLogMapper.selectQwWatchLogByQwUserId(id, createTime);
+            QwWatchLogStatisticsListVO stat = qwWatchLogMapper.selectQwExtCountByDayAndOther(id, createTime);
             vo.setD1Online(stat.getD1Online());
             vo.setD1Over(stat.getD1Over());
             vo.setFirstOnline(stat.getFirstOnline());

fs-service/src/main/java/com/fs/sop/vo/SopUserLogsVo.java

@@ -22,7 +22,6 @@ public class SopUserLogsVo  {
     private Integer minSend;
     private Long externalId;
     private Integer maxSend;
-    private Integer filterMode;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String startTime;