Переглянути джерело

fix(app):修复课程原价为空时的处理逻辑

- 在编辑课程时,若原价为空则设置为零-修复了场地查询中场馆ID的条件判断问题
- 增加了场馆名称字段以完善场地信息展示
- 优化了订单服务中的日期格式化处理
- 启用了定时任务以同步门禁开关记录
SheepHy 3 тижнів тому
батько
коміт
bc371324db

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

@@ -339,7 +339,7 @@ public class DetailServiceImpl implements IDetailService {
             List<ConcertsVO>  concertsVOList=null;
             //查询当天所有场地和场次及状态
             if (label){
-                concertsVOList= appSitePlaceMapper.findByConcertsAndTime(stadiumConcertsVO.getWeekDayAndDate(),stadiumConcertsVO.getWeekDay(),siteId,categoryId);
+                concertsVOList= appSitePlaceMapper.findByConcertsAndTime(stadiumConcertsVO.getWeekDayAndDate().replaceAll(".*\\(([^)]+)\\).*", "$1"),stadiumConcertsVO.getWeekDay(),siteId,categoryId);
             }else {
                 concertsVOList= appSitePlaceMapper.findByConcerts(stadiumConcertsVO.getWeekDayDate(),stadiumConcertsVO.getWeekDay(),siteId,categoryId);
             }

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

@@ -653,6 +653,7 @@ public class OrderServiceImpl implements IOrderService {
                         appOrderProInfo.setProductName(date.substring(5) + " " + startTime + "-" + endTime + "|" + appSitePlace.getName());
                         appOrderProInfo.setProductImage(appSitePlace.getCover());
                         appOrderProInfo.setExpireTime(expireTime);
+                        appOrderProInfo.setUseDateStr(date.substring(5));
                         appOrderProInfo.setAddress(appSite.getName());
                         appOrderProInfo.setType(CommonConstant.ORDER_PRO_INFO_TYPE_1);
                         appOrderProInfo.setProductImage(appSite.getCover());

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

@@ -236,7 +236,7 @@ public class OrTeachingJobService {
      * @Param
      * @return
      **/
-//    @Scheduled(fixedDelay = 7200000)
+    @Scheduled(fixedDelay = 7200000)
 //    @Scheduled(cron = "0 0 23 * * ?")
     public void synchronousDoorOpeningAndClosingRecords(){
         try {

+ 2 - 0
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppSitePlaceUnfixedDTO.java

@@ -73,4 +73,6 @@ public class AppSitePlaceUnfixedDTO {
     @NotNull(message = "售价不允许为空")
     @Schema(description = "售价")
     private BigDecimal sellingPrice;
+    @Schema(description = "场馆名称")
+    private String venuesName;
 }

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

@@ -136,7 +136,7 @@ public class AppCoureseServiceImpl extends ServiceImpl<AppCoursesMapper, AppCour
     public Boolean editWitchPriceRules(AppCoursesDTO appCoursesDTO) {
         AppCoursesCuDTO coursesCuDTO = appCoursesDTO.getCourses();
         if (null == coursesCuDTO.getCategoryId()) throw new JeecgBootException("请选择课程类别");
-
+        if(null == appCoursesDTO.getCourses().getOriginalPrice()) appCoursesDTO.getCourses().setOriginalPrice(BigDecimal.ZERO);
         AppCourses appCourses = baseMapper.selectById(coursesCuDTO.getId());
         BeanUtils.copyProperties(coursesCuDTO, appCourses);
         appCourses.setAddressSiteId(coursesCuDTO.getAddressSiteId());

+ 4 - 2
national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppSitePlaceServiceImpl.java

@@ -362,15 +362,17 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         Page<AppSitePlace> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         LambdaQueryWrapper<AppSitePlace> wrapper = Wrappers.<AppSitePlace>lambdaQuery().eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
-//                .eq(AppSitePlace::getSiteId, dto.getSiteId())
                 .likeRight(AppSitePlace::getOrgCode, loginUser.getOrgCode())
                 .eq(AppSitePlace::getType, SitePlaceTypeEnum.UNFIXED.getCode())
                 .like(StringUtils.isNotBlank(dto.getName()), AppSitePlace::getName, dto.getName()).orderByDesc(AppSitePlace::getCreateTime);
-
+        if(null != dto.getSiteId() && !"ALL".equals(dto.getSiteId())){
+            wrapper.eq(AppSitePlace::getSiteId, dto.getSiteId());
+        }
         IPage<AppSitePlace> resultPage = baseMapper.selectPage(page, wrapper);
         return resultPage.convert(record -> {
             AppSitePlaceUnfixedDTO appSitePlaceUnfixedDTO = new AppSitePlaceUnfixedDTO();
             BeanUtils.copyProperties(record, appSitePlaceUnfixedDTO);
+            appSitePlaceUnfixedDTO.setVenuesName(appSiteMapper.selectById(record.getSiteId()).getName());
             List<AppSitePriceRules> appSitePriceRulesList = appSitePriceRulesMapper.selectList(
                     Wrappers.<AppSitePriceRules>lambdaQuery().eq(AppSitePriceRules::getSitePlaceId, record.getId()).eq(AppSitePriceRules::getStatus, CommonConstant.STATUS_0_INT));
             if (CollUtil.isNotEmpty(appSitePriceRulesList)) {