1、提交订单问题处理

2、四福堂配置问题

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

@@ -2621,10 +2621,13 @@ public class FsUserCourseVideoServiceImpl extends ServiceImpl<FsUserCourseVideoM
         }
         // 项目看课数限制
         if (!EXCLUDE_PROJECTS.contains(signProjectName) && !CloudHostUtils.hasCloudHostName("弘德堂")) {
+            log.error("进入了看课限制：传入参数：={}，watchCourseVideo={}",param, watchCourseVideo);
             Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), courseProject);
             if (Objects.isNull(watchCourseVideo) && logCount > 0) {
                 return ResponseResult.fail(504, "超过项目看课数量限制");
             }
+        }else {
+            log.error("没有进入看课限制：传入参数：={}，watchCourseVideo={}存在问题 ",param, watchCourseVideo);
         }
         //添加判断：该用户是否已经存在此课程的看课记录，并且看课记录的销售id不是传入的销售id
         if (watchCourseVideo != null) {

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

@@ -3111,10 +3111,23 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
 
             //获取运费模板区域列表按照城市排序
             List<FsShippingTemplatesRegionScrm> shippingTemplatesRegionList = shippingTemplatesRegionService.selectFsShippingTemplatesRegionListByTempIdsAndCityIds(StringUtils.join(tempIds, ","), StringUtils.join(citys, ","));
-
+            boolean isQg = false;
+
+            if (CollectionUtils.isEmpty(shippingTemplatesRegionList)&&CollectionUtils.isNotEmpty(shippingTemplatesList)&&shippingTemplatesList.size()<2) {
+                List<RegionInfoDTO> regionList = JSONObject.parseArray(
+                        shippingTemplatesList.get(0).getRegionInfo(),
+                        RegionInfoDTO.class
+                );
+                if (regionList != null && !regionList.isEmpty()) {
+                    RegionInfoDTO regionDTO = regionList.get(0);
+                    if ("默认全国".equals(regionDTO.getRegionName())) {
+                        isQg = true;
+                    }
+                }
+            }
             // 有运费模板，但当前城市没有匹配的区域
             if (shippingTemplatesList != null && !shippingTemplatesList.isEmpty()
-                    && (shippingTemplatesRegionList == null || shippingTemplatesRegionList.isEmpty())) {
+                    && (shippingTemplatesRegionList == null || shippingTemplatesRegionList.isEmpty())&&!isQg) {
                 logger.error("运费模板存在，但城市不在运费模板区域内，cityId: {}", cityId);
                 return badCode;
             }
@@ -3143,7 +3156,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 // 如果商品有运费模板，但没有找到对应的区域配置，返回错误码
                 if (shippingTemplatesList != null && !shippingTemplatesList.isEmpty()
                         && shippingTemplatesList.stream().anyMatch(t -> t.getId().equals(tempId))
-                        && shippingTemplatesRegion == null) {
+                        && shippingTemplatesRegion == null&&!isQg) {
                     logger.error("商品运费模板存在，但城市不在运费模板区域内，tempId: {}, cityId: {}", tempId, cityId);
                     return badCode;
                 }

fs-service/src/main/java/com/fs/newAdv/service/impl/LeadServiceImpl.java

@@ -119,20 +119,24 @@ public class LeadServiceImpl extends ServiceImpl<LeadMapper, Lead> implements IL
     @Override
     @Async("asyncExecutor")
     public void weChatAuthorizationLead(String traceId, String unionId, String mpOpenId, String phone) {
-        Lead byTraceId = this.getByTraceId(traceId);
-        if (byTraceId == null) {
-            return;
-        }
-        this.update(new LambdaUpdateWrapper<Lead>()
-                .eq(Lead::getTraceId, traceId)
-                .set(Lead::getUnionid, unionId)
-                .set(Lead::getPhone, phone)
-                .set(Lead::getOpenid, mpOpenId)
-                .set(Lead::getMiniAuth, 1));
-        if (ObjectUtil.isNotEmpty(byTraceId.getLandingPageTs()) && byTraceId.getLandingPageTs().toLocalDate().isEqual(LocalDate.now())) {
-            // 微信授权且当日创建事件
-            conversionEventPublisher.publishConversionEvent(traceId, SystemEventTypeEnum.AUTH_TODAY_CREATE);
-        }
+       try{
+           Lead byTraceId = this.getByTraceId(traceId);
+           if (byTraceId == null) {
+               return;
+           }
+           this.update(new LambdaUpdateWrapper<Lead>()
+                   .eq(Lead::getTraceId, traceId)
+                   .set(Lead::getUnionid, unionId)
+                   .set(Lead::getPhone, phone)
+                   .set(Lead::getOpenid, mpOpenId)
+                   .set(Lead::getMiniAuth, 1));
+           if (ObjectUtil.isNotEmpty(byTraceId.getLandingPageTs()) && byTraceId.getLandingPageTs().toLocalDate().isEqual(LocalDate.now())) {
+               // 微信授权且当日创建事件
+               conversionEventPublisher.publishConversionEvent(traceId, SystemEventTypeEnum.AUTH_TODAY_CREATE);
+           }
+       }catch (Exception e){
+           e.printStackTrace();
+       }
     }
 
     @Override

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

@@ -62,6 +62,12 @@ watch:
 fs :
   commonApi: http://172.30.0.11:8010
   h5CommonApi: http://119.29.195.254:8010
+  jwt:
+    # 加密秘钥
+    secret: 9a3f7b1c2e8d45a0f632b819e4c56d12
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16
@@ -78,6 +84,7 @@ cloud_host:
   projectCode: SFT
   spaceName:
   volcengineUrl:
+
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://sft-1361917636.cos.ap-chongqing.myqcloud.com/sft/20250606/b08b1a6212f44f2998423c8c5d7712ee.png