bug修改

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/shipSaleRule/vo/ShipSaleRuleRespVO.java

@@ -36,6 +36,26 @@ public class ShipSaleRuleRespVO {
     @ExcelProperty("过期时间（不填默认0点，结合过期天数）")
     private Integer expireHour;
 
+    @Schema(description = "直客确定日期（开航前多少天）")
+    @ExcelProperty("直客确定日期（开航前多少天）")
+    private Integer zkqdDay;
+
+    @Schema(description = "直客确定时间（当天几点，比如：12点）")
+    @ExcelProperty("直客确定时间（当天几点，比如：12点）")
+    private Integer zkqdHour;
+
+    @Schema(description = "直客变更时间（开航前多少天内修改游客信息需要审核）")
+    @ExcelProperty("直客变更时间（开航前多少天内修改游客信息需要审核）")
+    private Integer zkbgDay;
+
+    @Schema(description = "直客过期天数（开航前多少天过期）")
+    @ExcelProperty("直客过期天数（开航前多少天过期）")
+    private Integer zkexpireDay;
+
+    @Schema(description = "直客过期时间（不填默认0点，结合过期天数）")
+    @ExcelProperty("直客过期时间（不填默认0点，结合过期天数）")
+    private Integer zkexpireHour;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/shipSaleRule/vo/ShipSaleRuleSaveReqVO.java

@@ -25,4 +25,19 @@ public class ShipSaleRuleSaveReqVO {
     @Schema(description = "过期时间（不填默认0点，结合过期天数）")
     private Integer expireHour;
 
+    @Schema(description = "确定日期（开航前多少天）")
+    private Integer zkqdDay;
+
+    @Schema(description = "确定时间（当天几点，比如：12点）")
+    private Integer zkqdHour;
+
+    @Schema(description = "变更时间（开航前多少天内修改游客信息需要审核）")
+    private Integer zkbgDay;
+
+    @Schema(description = "过期天数（开航前多少天过期）")
+    private Integer zkexpireDay;
+
+    @Schema(description = "过期时间（不填默认0点，结合过期天数）")
+    private Integer zkexpireHour;
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/shipSaleRule/ShipSaleRuleDO.java

@@ -47,4 +47,25 @@ public class ShipSaleRuleDO extends BaseDO {
      */
     private Integer expireHour;
 
+    /**
+     * 确定日期（开航前多少天）
+     */
+    private Integer zkqdDay;
+    /**
+     * 确定时间（当天几点，比如：12点）
+     */
+    private Integer zkqdHour;
+    /**
+     * 变更时间（开航前多少天内修改游客信息需要审核）
+     */
+    private Integer zkbgDay;
+    /**
+     * 过期天数（开航前多少天过期）
+     */
+    private Integer zkexpireDay;
+    /**
+     * 过期时间（不填默认0点，结合过期天数）
+     */
+    private Integer zkexpireHour;
+
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/job/OrderStausJob.java

@@ -1,14 +1,41 @@
 package com.yc.ship.module.trade.job;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.yc.ship.framework.quartz.core.handler.JobHandler;
+import com.yc.ship.module.trade.dal.dataobject.shipSaleRule.ShipSaleRuleDO;
+import com.yc.ship.module.trade.service.shipSaleRule.ShipSaleRuleService;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+import java.util.Calendar;
+import java.util.Date;
+
 @Component
 public class OrderStausJob implements JobHandler {
+    @Resource
+    private ShipSaleRuleService shipSaleRuleService;
 
-
+    /**
+     * 执行订单状态相关操作-初定自动确认
+     *
+     * 当前实现中，该方法会获取一条船舶销售规则，但未使用传入的参数和获取的规则，
+     * 直接返回固定字符串"成功"。实际业务逻辑可能需要进一步完善。
+     *
+     * @param param 传入的参数（当前未使用）
+     * @return 固定返回字符串"成功"
+     */
     @Override
     public String execute(String param) {
+        ShipSaleRuleDO shipSaleRuleOne = shipSaleRuleService.getShipSaleRuleOne();
+        int  qdday = shipSaleRuleOne.getQdDay();
+        int qdhour = shipSaleRuleOne.getQdHour();
+        Date n = DateUtil.offsetDay(new DateTime(), qdday);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(n);
+        calendar.set(Calendar.HOUR_OF_DAY, qdhour);
+        Date time = calendar.getTime();
+
 
         return "成功";
     }