Jelajahi Sumber

fix batch logic bug

libin 2 tahun lalu
induk
melakukan
ee82560b6c

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/schedulTask/schedulTask.java

@@ -142,15 +142,15 @@ public class schedulTask
             if(new Date().compareTo(dateSdf.parse(tCommodityManage.getPeriodEnd())) <= 0){
                 // 判断提前截至日期
                 Calendar calendar = Calendar.getInstance();
-                calendar.add(Calendar.DATE, -tCommodityManage.getAdvancePeriod());// num为增加的天数,可以改变的
+                calendar.add(Calendar.DATE, tCommodityManage.getAdvancePeriod());// num为增加的天数,可以改变的
                 Date d = calendar.getTime();
-                if(new Date().compareTo(d)>= 0){
+                if(new Date().compareTo(d)< 0){
                     order.setCommodityId(tCommodityManage.getId());
                     order.setStatus("1");// 查询已支付的订单
                     order.setDepartureDate(dateSdf.format(d));
                     List<TOrderManage> orderManageList = orderManageService.selectTOrderManageList4H5(order);
                     // 判断出行人数是否达标
-                    if(orderManageList.size() < tCommodityManage.getAdvancePeriod()){
+                    if(orderManageList.size() < tCommodityManage.getTargetPeopleNum()){
                         // 自动退款
                         for (TOrderManage orderManage : orderManageList) {
                         	//
@@ -214,7 +214,7 @@ public class schedulTask
      */
     @Transactional
     @SuppressWarnings("all")
-    @Scheduled(cron = "0 8 * * * ?")
+    @Scheduled(cron = "0 0 8 * * ?")
     public void lineSendMsgScheduleTask() throws Exception{
     	//
     	LocalDate tomorrow = LocalDate.now().plusDays(1);

+ 1 - 0
ruoyi-admin/src/main/resources/mapper/order/TOrderManageMapper.xml

@@ -422,6 +422,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.departure_date,
                a.adult_num,
                a.child_num,
+               a.dept_id,
                b.username phone
             from t_order_manage a
                 inner join t_customer_manage b on a.customer_id = b.id

+ 1 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginCustomerManage.java

@@ -55,5 +55,6 @@ public class LoginCustomerManage extends BaseEntity
     @Excel(name = "昵称")
     private String nickName;
 
+    /** liffId */
     private String liffId;
 }