fix(app):

1.bug修复

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

@@ -537,19 +537,21 @@ public class OrderServiceImpl implements IOrderService {
                         stock = product.getTicketNum();
                         redisTemplate.opsForValue().set(stockKey, stock, 60 * 60 * 24, TimeUnit.SECONDS);
                     }
+                    //使用人
+                    List<String> ids = Arrays.stream(createOrderForm.getFamilyIds().split(",")).collect(Collectors.toList());
 
                     // 检查库存是否足够
-                    if (stock < count) {
+                    if (stock < ids.size()) {
                         throw new JeecgBootException("订单提交失败，库存不足");
                     }
 
                     // 更新数据库中的库存数据
                     int row = appSitePriceRulesMapper.update(null, Wrappers.<AppSitePriceRules>lambdaUpdate()
                             .eq(AppSitePriceRules::getId, productId)
-                            .set(AppSitePriceRules::getTicketNum, stock - count));
+                            .set(AppSitePriceRules::getTicketNum, stock - ids.size()));
                     if (row > 0) {
                         // 更新Redis中缓存的商品库存数据
-                        redisTemplate.opsForValue().decrement(stockKey, count);
+                        redisTemplate.opsForValue().decrement(stockKey, ids.size());
                     }
                     // 库存扣减完，创建订单
                     appOrder
@@ -569,14 +571,12 @@ public class OrderServiceImpl implements IOrderService {
                             .setUpdateBy(user.getId())
                             .setStatus(CommonConstant.STATUS_NORMAL)
                             .setDelFlag(CommonConstant.DEL_FLAG_0);
-                    //使用人
-                    List<String> ids = Arrays.stream(createOrderForm.getFamilyIds().split(",")).collect(Collectors.toList());
+
                     for (String id : ids) {
                         FamilyMembers familyMembers = familyMembersMapper.selectById(id);
                         if (Objects.isNull(familyMembers)) {
-
+                            throw new JeecgBootException("订单提交失败，用户不存在");
                         }
-
                         String date = DateUtil.format(priceRule.getDateOfSale(), "yyyy-MM-dd");
                         String startTime = DateUtil.format(priceRule.getStartTime(), "HH:mm:ss");
                         String endTime = DateUtil.format(priceRule.getEndTime(), "HH:mm:ss");

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/AppCoursesPageDTO.java

@@ -36,6 +36,6 @@ public class AppCoursesPageDTO extends BasePageDTO {
     private Integer coursesStatus;
 
     @Schema(description = "类目")
-    private Integer categoryId;
+    private String categoryId;
 
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/form/AppOrderPageForm.java

@@ -10,7 +10,6 @@ import lombok.experimental.Accessors;
 import org.jeecg.modules.system.app.dto.BasePageDTO;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -30,7 +29,6 @@ public class AppOrderPageForm extends BasePageDTO implements Serializable {
     private String orderCode;
 
     @Schema(description = "部门编码")
-    @NotBlank(message = "部门编码不能为空")
     private String orgCode;
 
     @Schema(description = "订单状态 0-待付款 1-待使用 2-已使用 3-已到期 4-已取消")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppOrderMapper.xml

@@ -18,7 +18,7 @@
                 and o.org_code like CONCAT(#{appOrderPageForm.orgCode},'%')
             </if>
             <if test="appOrderPageForm.userPhone != null and appOrderPageForm.userPhone !=''">
-                and o.use_phone LIKE CONCAT('%',#{appOrderPageForm.userPhone},'%')
+                and o.user_phone LIKE CONCAT('%',#{appOrderPageForm.userPhone},'%')
             </if>
             <if test="appOrderPageForm.orderCode != null and appOrderPageForm.orderCode !=''">
                 and o.order_code LIKE CONCAT('%',#{appOrderPageForm.orderCode},'%')

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppSitePriceRulesMapper.xml

@@ -113,7 +113,7 @@
             #{item.dayOfWeek},
             #{item.originalPrice},
             #{item.sellingPrice},
-            #{item.ticket_num},
+            #{item.ticketNum},
             #{item.isTeaching},
             #{item.inventory},
             #{item.siteRuleTimeId},

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

@@ -92,7 +92,7 @@ public class AppCategoryServiceImpl extends ServiceImpl<AppCategoryMapper, AppCa
         String orgCode = loginUser.getOrgCode();
         AppSite site = appSiteMapper.selectOne(Wrappers.<AppSite>lambdaQuery().eq(AppSite::getOrgCode, orgCode));
         String categoryIds = site.getCategoryId();
-        if (StringUtils.isEmpty(categoryIds)){
+        if (StringUtils.isNotEmpty(categoryIds)){
             for (String id : categoryIds.split(",")) {
                 AppCategory category = baseMapper.selectById(id);
                 AppCategoryVO vo = new AppCategoryVO();

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

@@ -75,7 +75,7 @@ public class AppCoursesVerificationRecordServiceImpl extends ServiceImpl<AppCour
                     orderProInfo.setOrderStatus(CommonConstant.ORDER_STATUS_2);
                     appOrderProInfoMapper.updateById(orderProInfo);
                 }
-                String orderId = orderProInfo.getOrderId();
+                 String orderId = orderProInfo.getOrderId();
                 AppOrder appOrder = appOrderMapper.selectById(orderId);
                 if (ObjectUtil.isNotEmpty(appOrder)){
                     List<AppOrderProInfo> proInfoList = appOrderProInfoMapper.selectList(Wrappers.<AppOrderProInfo>lambdaQuery().eq(AppOrderProInfo::getOrderId, orderId).eq(AppOrderProInfo::getType, CommonConstant.ORDER_PRO_INFO_TYPE_5));

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

@@ -727,7 +727,21 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
 //            Map<String, List<String>> HolidayMap = HolidayUtil.getYearHoliday(String.valueOf(year));
 
             //当前日期
-            Date currDate = DateUtils.str2Date(DateUtils.now(), new SimpleDateFormat("yyyy-MM-dd"));
+//            Date currDate = DateUtils.str2Date(DateUtils.now(), new SimpleDateFormat("yyyy-MM-dd"));
+
+            // 创建一个Calendar实例
+            Calendar calendar = Calendar.getInstance();
+
+            // 获取当前日期
+            Date currentDate = new Date();
+            calendar.setTime(currentDate);
+
+            // 将日期向前推一天
+            calendar.add(Calendar.DAY_OF_MONTH, -1);
+
+            // 获取前一天的日期
+            Date previousDate = calendar.getTime();
+
 
             // 设置开始日期和结束日期
             Date beginDate = DateUtils.str2Date((year) + "-01-01 00:00:00", new SimpleDateFormat("yyyy-MM-dd"));
@@ -736,7 +750,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
             // 获取开始日期和结束日期之间的所有日期
             List<Date> dateList = HolidayUtil.getDaysBetweenDates(beginDate, endDate);
             //当前日期之后的数据
-            List<Date> dates = dateList.stream().filter(date -> date.after(currDate)).collect(Collectors.toList());
+            List<Date> dates = dateList.stream().filter(date -> date.after(previousDate)).collect(Collectors.toList());
 
             //部门、场地、教学日（teaching）、
             List<AppSitePriceRules> appSitePriceRulesList = new ArrayList<>();
@@ -810,7 +824,7 @@ public class AppSitePlaceServiceImpl extends ServiceImpl<AppSitePlaceMapper, App
                 }
             }
             //存放开放时段列表(删除再新增)
-            appSitePriceRulesMapper.delete(Wrappers.<AppSitePriceRules>lambdaQuery().gt(AppSitePriceRules::getDateOfSale, currDate).eq(AppSitePriceRules::getOrgCode, site.getOrgCode()));
+            appSitePriceRulesMapper.delete(Wrappers.<AppSitePriceRules>lambdaQuery().gt(AppSitePriceRules::getDateOfSale, previousDate).eq(AppSitePriceRules::getOrgCode, site.getOrgCode()));
             appSitePriceRulesMapper.insertList(appSitePriceRulesList);
 
             appSiteMapper.updateById(site);

national-motion-module-system/national-motion-system-start/src/main/resources/redisson.yml

@@ -3,15 +3,15 @@ singleServerConfig:
   idleConnectionTimeout: 10000
   pingTimeout: 1000
   #连接超时，单位：毫秒
-  connectTimeout: 10000
+  connectTimeout: 30000
   #命令等待超时，单位：毫秒
-  timeout: 3000
+  timeout: 5000
   #命令失败重试次数
   retryAttempts: 3
   #命令重试发送时间间隔，单位：毫秒
-  retryInterval: 1500
+  retryInterval: 15000
   #重新连接时间间隔，单位：毫秒
-  reconnectionTimeout: 3000
+  reconnectionTimeout: 5000
   #执行失败最大次数
   failedAttempts: 3
   #单个连接最大订阅数量