fix(order):修复订单免费类型判断逻辑

- 修改订单免费类型从课程价格类型改为表单传参
- 添加试听和非试听课的注释标识
- 调整折扣计算逻辑以适配新的免费订单类型
- 注释掉定时任务服务的组件注解

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/service/impl/OrderServiceImpl.java

@@ -893,7 +893,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
                 }
                 List<AppCoursesPriceRules> priceRulesList = appCoursesPriceRulesMapper.selectList(Wrappers.<AppCoursesPriceRules>lambdaQuery().eq(AppCoursesPriceRules::getCoursesId, appCourse.getId()));
                 AppSite appSite = appSiteMapper.selectById(appCourse.getAddressSiteId());
-                appOrder.setOrderOrFree(appCourse.getPriceType());
+                appOrder.setOrderOrFree(createOrderForm.getOrFreeOrder());
                 appOrder.setType(CommonConstant.ORDER_TYPE_2);
                 appOrder.setOrgCode(appCourse.getOrgCode());
                 appOrder.setTenantId(appCourse.getTenantId());
@@ -962,6 +962,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
                     if (CollUtil.isNotEmpty(priceRulesList)) {
 
                         if (Objects.equals(appOrder.getOrderOrFree(), CommonConstant.STATUS_0_INT)) {
+                            //非试听课
                             for (AppCoursesPriceRules appCoursesPriceRules : priceRulesList) {
                                 AppCoursesVerificationRecord appCoursesVerificationRecord = new AppCoursesVerificationRecord();
                                 appCoursesVerificationRecord.setCoursesId(appCourse.getId());
@@ -980,6 +981,7 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
                                 appCoursesVerificationRecordList.add(appCoursesVerificationRecord);
                             }
                         }
+                        //试听课
                         if (Objects.equals(appOrder.getOrderOrFree(), CommonConstant.STATUS_1_INT)) {
                             priceRulesList.sort(Comparator.comparing(AppCoursesPriceRules::getSort));
                             AppCoursesPriceRules appCoursesPriceRules = priceRulesList.get(0);
@@ -1019,7 +1021,6 @@ public class OrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> impl
                     }
                     proInfoList.add(appOrderProInfo);
 
-
                     tDiscounts = tDiscounts.add(appCourse.getOriginalPrice().subtract(appCourse.getSellingPrice()));
                     if (createOrderForm.getOrFreeOrder() == 1) {
                         tDiscounts = BigDecimal.ZERO;

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/quartz/job/TodayExpireOrderJobService.java

@@ -18,7 +18,7 @@ import javax.annotation.Resource;
  */
 @Slf4j
 @AllArgsConstructor
-@Component
+//@Component
 public class TodayExpireOrderJobService {