代码规范优化

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/controller/admin/distributorproduct/vo/product/ProductGroupRespVO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/9/2 15:48
  */

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/util/OtaAuthUtils.java

@@ -20,9 +20,9 @@ import javax.annotation.Resource;
 import java.util.concurrent.TimeUnit;
 
 /**
- * @Description ：旅行社认证服务工具
- * @Author ：qsl
- * @Date ：2025/6/11 10:33
+ * @Description ：旅行社认证服务工具
+ * @Author ：qsl
+ * @Date ：2025/6/11 10:33
  */
 @Component
 public class OtaAuthUtils {

ship-module-otc/ship-module-otc-api/src/main/java/com/yc/ship/module/otc/api/store/dto/StoreCardRespDTO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/12/26 10:09
  */

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/api/agency/AgencyAuthApiImpl.java

@@ -14,9 +14,9 @@ import static com.yc.ship.module.otc.enums.ErrorCodeConstants.AGENCY_LOGIN_LOG_E
 
 
 /**
- * @Description 旅行社授权接口
- * @Author qsl
- * @Date 2025/6/4 15:28
+ * @Description 旅行社授权接口
+ * @Author qsl
+ * @Date 2025/6/4 15:28
  */
 @RestController // 提供 RESTful API 接口，给 Feign 调用
 @Validated

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/api/link/LinkApiImpl.java

@@ -25,9 +25,9 @@ import static com.yc.ship.framework.common.util.collection.CollectionUtils.conve
 
 
 /**
- * @Description 旅行社授权接口
- * @Author qsl
- * @Date 2025/6/4 15:28
+ * @Description 旅行社授权接口
+ * @Author qsl
+ * @Date 2025/6/4 15:28
  */
 @RestController // 提供 RESTful API 接口，给 Feign 调用
 @Validated

ship-module-otc/ship-module-otc-biz/src/main/java/com/yc/ship/module/otc/api/store/StoreApiImpl.java

@@ -41,9 +41,9 @@ import static com.yc.ship.module.otc.enums.ErrorCodeConstants.*;
 
 
 /**
- * @Description 旅行社授权接口
- * @Author qsl
- * @Date 2025/6/4 15:28
+ * @Description 旅行社授权接口
+ * @Author qsl
+ * @Date 2025/6/4 15:28
  */
 @RestController // 提供 RESTful API 接口，给 Feign 调用
 @Validated

ship-module-product/ship-module-product-api/src/main/java/com/yc/ship/module/product/api/dto/RoutePlanRespDTO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/7/30 15:44
  */

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/voyage/vo/VoyageSaveBatchReqVO.java

@@ -10,7 +10,7 @@ import java.util.List;
  * 批量保存航次管理
  *
  * @author yc
- * @since 2023-04-23
+ * @since 2025-04-23
  */
 @Schema(description = "管理后台 - 批量保存航次管理")
 @Data

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/helper/DateHelper.java

@@ -1648,7 +1648,7 @@ public class DateHelper {
     /**
      * @description: 指定日期所在月的第一天
      * @author yxq
-     * @date 2021/5/24
+     * @date 2025/5/24
      * @version 1.0
      */
     public static Date getAppointMonthStartDate(Date date) {
@@ -1662,7 +1662,7 @@ public class DateHelper {
     /**
      * @description: 指定日期所在月的最后一天
      * @author yxq
-     * @date 2021/5/24
+     * @date 2025/5/24
      * @version 1.0
      */
     public static Date getAppointMonthLastDate(Date date) {
@@ -1678,7 +1678,7 @@ public class DateHelper {
     /**
      * @description: 指定日期所在年的第一天
      * @author yxq
-     * @date 2021/5/24
+     * @date 2025/5/24
      * @version 1.0
      */
     public static String getAppointYearStartDate(Date date) {
@@ -1693,7 +1693,7 @@ public class DateHelper {
     /**
      * @description: 指定日期所在年的最后一天
      * @author yxq
-     * @date 2021/5/24
+     * @date 2025/5/24
      * @version 1.0
      */
     public static String getAppointYearLastDate(Date date) {
@@ -1761,7 +1761,7 @@ public class DateHelper {
     /**
      * @description: 指定的日期内重写小时和分钟
      * @author yxq
-     * @date 2021/5/24
+     * @date 2025/5/24
      * @version 1.0
      */
     public static Date setAppointDateByHourAndMinute(Date date, int hour, int minute) {

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/helper/MathHelper.java

@@ -13,7 +13,7 @@ import java.util.regex.Pattern;
 
 /**
  * @author y
- * @date 2020-05-14
+ * @date 2025-05-14
  */
 public class MathHelper {
 
@@ -373,7 +373,7 @@ public class MathHelper {
      * @param number  数值
      * @param company 单位（元、人次 等......）
      * @author luchuan
-     * @date 2020/9/3
+     * @date 2025/9/3
      * @return 万元、万人次、亿元、亿人次
      */
     public static String formatNumber(Number number, String company) {
@@ -402,7 +402,7 @@ public class MathHelper {
      * @param unit 单位（元、人次 等，必传参数）
      * @param scale 小数位长度（默认是两位，非必传参数）
      * @author yxq
-     * @date 2020/9/3
+     * @date 2025/9/3
      * @return 万元、万人次、亿元、亿人次
      */
     public static NumberUnitEntity formmatNumberUnit(String number, String unit, Integer flag, Integer scale) {
@@ -443,7 +443,7 @@ public class MathHelper {
     /**
      * @description: 两个bigdecimal数相除，四舍五入，小数位数默认是2位,小数位数中末尾是0的则去掉
      * @author yxq
-     * @date 2021/5/31
+     * @date 2025/5/31
      * @version 1.0
      */
     public static BigDecimal bigdecimalDividRhu(BigDecimal divisor,BigDecimal dividend,Integer scale){
@@ -469,7 +469,7 @@ public class MathHelper {
      * @param bit      保留位数
      * @return
      * @author luchuan
-     * @date 2020/9/3
+     * @date 2025/9/3
      */
     public static String reservedBits(Number dividend, Number divisor, int bit) {
 
@@ -494,7 +494,7 @@ public class MathHelper {
      * @param thisYOY:本期同比
      * @return
      * @author luchuan
-     * @date 2020/9/4
+     * @date 2025/9/4
      */
     public static String getLastNumber(Number thisNumber, Number thisYOY, int bit) {
         BigDecimal bigDecimalThisNumber = new BigDecimal(thisNumber.doubleValue());
@@ -519,7 +519,7 @@ public class MathHelper {
      * @param thisNumber:本期
      * @return
      * @author luchuan
-     * @date 2020/9/4
+     * @date 2025/9/4
      */
     public static String getNumberYOY(Number thisNumber, Number lastNumber, int bit) {
 
@@ -547,7 +547,7 @@ public class MathHelper {
      * @param bit      保留位数
      * @return
      * @author yangxiaoquan
-     * @date 2020/12/22
+     * @date 2025/12/22
      */
     public static int reservedPercentage(Number dividend, Number divisor, int bit) {
 
@@ -608,7 +608,7 @@ public class MathHelper {
      * @param dividend 被除数
      * @return String  返回字符串的小数形式数据
      * @author yangxiaoquan
-     * @date 2021/09/24
+     * @date 2025/09/24
      */
 
     public static String reservedPercentageDot(BigDecimal dividend, BigDecimal divisor) {
@@ -622,7 +622,7 @@ public class MathHelper {
      * @param bit      保留位数，未乘以100的小数点后的长度，如设为4，则最后的结果是保留两位小数，默认是4
      * @return String  返回字符串的小数形式数据
      * @author yangxiaoquan
-     * @date 2021/09/24
+     * @date 2025/09/24
      */
     public static String reservedPercentageDot(BigDecimal dividend, BigDecimal divisor, Integer bit) {
         if(null == dividend || divisor == null){

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/helper/entity/NumberUnitEntity.java

@@ -4,7 +4,7 @@ package com.yc.ship.module.resource.helper.entity;
  * @author yxq
  * @version 1.0
  * @description: TODO
- * @date 2021/5/31 10:55
+ * @date 2025/5/31 10:55
  */
 public class NumberUnitEntity {
 

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/guidecheckin/GuideCheckInService.java

@@ -58,34 +58,34 @@ public interface GuideCheckInService {
     PageResult<GuideCheckInRespVO> getGuideCheckInPage(GuideCheckInPageReqVO pageReqVO);
     
     /** 
-     * @Description //TODO 获取考勤数据
-     * @Author liuxlh
-     * @Date 2025/8/6 14:37 
+     * &#064;Description //TODO 获取考勤数据
+     * &#064;Author liuxlh
+     * &#064;Date 2025/8/6 14:37
      * @Param [pageReqVO]
      * @return java.util.List<com.zshl.dispatch.ops.store.controller.admin.guidecheckin.vo.GuideCheckInRespVO>
      **/
     List<GuideCheckInRespVO> getGuideCheckInList(GuideCheckInPageReqVO pageReqVO);
 
     /** 
-     * @Description //TODO 获取导游或驾驶员是否请假
-     * @Author liuxlh
-     * @Date 2025/8/6 14:39 
+     * &#064;Description //TODO 获取导游或驾驶员是否请假
+     * &#064;Author liuxlh
+     * &#064;Date 2025/8/6 14:39
      * @Param [pageReqVO]
      * @return boolean true:请假，false:未请假
      **/
     boolean validateGuideOrDriverCheckIn(GuideCheckInPageReqVO pageReqVO);
 
     /**
-     * @Description 考勤统计（按月为单位YYYY-MM,id-导游id/驾驶员id）
-     * @Author liuxlh
-     * @Date 2025/8/12 14:39
+     * &#064;Description 考勤统计（按月为单位YYYY-MM,id-导游id/驾驶员id）
+     * &#064;Author liuxlh
+     * &#064;Date 2025/8/12 14:39
      * @Param  [id-导游id/驾驶员id, dateM]
      **/
     public List<Map> checkInData(String id,Date dateM);
     /**
-     * @Description 考勤统计（按天为单位YYYY-MM-dd,id-导游id/驾驶员id）
-     * @Author liuxlh
-     * @Date 2025/8/12 14:39
+     * &#064;Description 考勤统计（按天为单位YYYY-MM-dd,id-导游id/驾驶员id）
+     * &#064;Author liuxlh
+     * &#064;Date 2025/8/12 14:39
      * @Param  [id-导游id/驾驶员id, dateM]
      **/
     public List<Map> checkInStatistics(String id,Date dateD);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/guidecheckin/GuideCheckInServiceImpl.java

@@ -193,9 +193,9 @@ public class GuideCheckInServiceImpl implements GuideCheckInService {
 
     /**
      * @return java.util.List<com.zshl.dispatch.ops.store.controller.admin.guidecheckin.vo.GuideCheckInRespVO>
-     * @Description //TODO 获取导游考勤数据
-     * @Author liuxlh
-     * @Date 2025/8/2 16:08
+     * &#064;Description //TODO 获取导游考勤数据
+     * &#064;Author liuxlh
+     * &#064;Date 2025/8/2 16:08
      * @Param [pageReqVO]
      **/
     public PageResult<GuideCheckInRespVO> getGuideCheckInData(GuideCheckInPageReqVO pageReqVO) {
@@ -254,9 +254,9 @@ public class GuideCheckInServiceImpl implements GuideCheckInService {
 
     /**
      * @return java.util.List<com.zshl.dispatch.ops.store.controller.admin.guidecheckin.vo.GuideCheckInRespVO>
-     * @Description //TODO 获取驾驶员考勤数据
-     * @Author liuxlh
-     * @Date 2025/8/2 16:08
+     * &#064;Description //TODO 获取驾驶员考勤数据
+     * &#064;Author liuxlh
+     * &#064;Date 2025/8/2 16:08
      * @Param [pageReqVO]
      **/
     public PageResult<GuideCheckInRespVO> getDriverCheckInData(GuideCheckInPageReqVO pageReqVO) {

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/resource/ResourceService.java

@@ -60,7 +60,7 @@ public interface ResourceService {
     List<ResourceDO> getResourceByCategoryId(Long categoryId);
 
     /***
-     *@Description 获取第三方直连资源列表(九凤谷、船舶物资)
+     *&#064;Description 获取第三方直连资源列表(九凤谷、船舶物资)
      *@author qsl
      *@date 2025/8/15 20:34
       *@param supplierId

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/resource/ResourceServiceImpl.java

@@ -124,7 +124,7 @@ public class ResourceServiceImpl implements ResourceService {
     }
 
     /***
-     *@Description 获取第三方直连资源列表(九凤谷、船舶物资)
+     *@Description 获取第三方直连资源列表(九凤谷、船舶物资)
      *@author qsl
      *@date 2025/8/15 10:08
       *@param supplierId

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/resource/util/DesUtil.java

@@ -14,7 +14,7 @@ import java.security.SecureRandom;
  * DesUtil for 同程 SameWay
  * @Title: DesUtil.java
  * @Package: com.wisesoft.scenic.util
- * @Description: TODO
+ * @Description: TODO
  * @author: zhoulonggui
  * @date: 2017年5月17日 下午2:51:24
  * @version: V1.0

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Activity.java

@@ -8,9 +8,9 @@ import java.util.Date;
 /**
  * 合同平台申请合同-自费项目
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "自费项目")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/AgencyAddress.java

@@ -7,9 +7,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同签约社信息-旅行社地址
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "旅行社地址")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Arrival.java

@@ -5,9 +5,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/ContractNoticeUrl.java

@@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/ContractResponseBody.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.contract.dto;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 17:10
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/ContractResponseBodyData.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.contract.dto;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 17:10
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/ContractResponseBodyError.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.contract.dto;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 17:10
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Cost.java

@@ -10,9 +10,9 @@ import java.util.Date;
 /**
  * 合同平台申请合同-费用信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "费用信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Departure.java

@@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/DepartureCity.java

@@ -10,9 +10,9 @@ import java.util.List;
 /**
  * 合同平台申请合同-行程信息-出发地信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "出发地信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Dispute.java

@@ -6,9 +6,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-争议解决信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "争议解决信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/GroupAgreement.java

@@ -6,9 +6,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-成团约定信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "成团约定信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/IdCard.java

@@ -7,9 +7,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-游客信息-游客-证件信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "证件信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Insurance.java

@@ -6,9 +6,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-保险信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "保险信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/InvokeResponse.java

@@ -1,7 +1,7 @@
 package com.yc.ship.module.trade.api.contract.dto;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 17:10
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Itinerary.java

@@ -10,9 +10,9 @@ import java.util.List;
 /**
  * 合同平台申请合同-行程信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "行程信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Meal.java

@@ -5,9 +5,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/QueryContractDTO.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 16:26
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/QueryContractError.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.contract.dto;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 16:25
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/QueryContractRespDTO.java

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 16:25
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/QueryContractResponse.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.api.contract.dto;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 16:25
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Route.java

@@ -8,9 +8,9 @@ import java.util.List;
 /**
  * 合同平台申请合同-行程信息-出发地信息-行程单
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "行程信息-出发地信息-行程单")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Shopping.java

@@ -9,9 +9,9 @@ import java.util.Date;
 /**
  * 合同平台申请合同-购物信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "购物信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Signatory.java

@@ -7,9 +7,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-签署人/游客代表
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "签署人/游客代表")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/SignatoryAddress.java

@@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/TourGuides.java

@@ -6,9 +6,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-导游信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "导游信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Tourist.java

@@ -7,9 +7,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-游客信息-游客
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "游客信息-游客")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/TouristTicketInfo.java

@@ -3,9 +3,9 @@ package com.yc.ship.module.trade.api.contract.dto;
 import lombok.Data;
 
 /**
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Data
 public class TouristTicketInfo {

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/TouristsInfo.java

@@ -8,9 +8,9 @@ import java.util.List;
 /**
  * 合同平台申请合同-游客信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "游客信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/Transport.java

@@ -7,9 +7,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同-行程信息-出发地信息-行程单-交通信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:49
- * @Description:
+ * @Description:
  */
 @Schema(description = "行程信息-出发地信息-行程单-交通信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/TravelAgency.java

@@ -6,9 +6,9 @@ import lombok.Data;
 /**
  * 合同平台申请合同签约社信息
  *
- * @Author: aoxiang
+ * @Author: qsl
  * @Date: 2025/03/20/16:25
- * @Description:
+ * @Description:
  */
 @Schema(description = "合同平台申请合同签约社信息")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/group/AppCreateOrderGroup.java

@@ -3,9 +3,9 @@ package com.yc.ship.module.trade.api.contract.dto.group;
 import javax.validation.groups.Default;
 
 /**
- * @Description ：APP下单分组，自助机、小程序等
- * @Author ：qsl
- * @Date ：2025/8/16 09:19
+ * @Description ：APP下单分组，自助机、小程序等
+ * @Author ：qsl
+ * @Date ：2025/8/16 09:19
  */
 public interface AppCreateOrderGroup extends Default {
     

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/contract/dto/group/WindowCreateOrderGroup.java

@@ -3,9 +3,9 @@ package com.yc.ship.module.trade.api.contract.dto.group;
 import javax.validation.groups.Default;
 
 /**
- * @Description ：窗口下单分组
- * @Author ：qsl
- * @Date ：2025/8/16 09:19
+ * @Description ：窗口下单分组
+ * @Author ：qsl
+ * @Date ：2025/8/16 09:19
  */
 public interface WindowCreateOrderGroup extends Default {
 

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/dto/PayOrderReqDTO.java

@@ -12,9 +12,9 @@ import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
- * @Description ：支付请求VO
- * @Author ：qsl
- * @Date ：2025/6/22 15:04
+ * @Description ：支付请求VO
+ * @Author ：qsl
+ * @Date ：2025/6/22 15:04
  */
 @Schema(description = "支付请求VO")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/dto/PayOrderRespDTO.java

@@ -7,9 +7,9 @@ import lombok.experimental.Accessors;
 import java.util.Map;
 
 /**
- * @Description ：支付返回VO
- * @Author ：qsl
- * @Date ：2025/6/22 15:04
+ * @Description ：支付返回VO
+ * @Author ：qsl
+ * @Date ：2025/6/22 15:04
  */
 @Schema(description = "支付返回VO")
 @Data

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/dto/RuleSpecDTO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/11/26 16:00
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/dto/RuleVerifyDTO.java

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/11/15 9:39
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/dto/TradeBindOrderReqDTO.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotNull;
 
 
-@Schema(description = "订单绑定请求DTO")
+@Schema(description = "订单审核请求DTO")
 @Data
 @Accessors(chain = true)
 public class TradeBindOrderReqDTO {

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/api/sms/SmsApi.java

@@ -13,7 +13,7 @@ import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 
 /****
- *@Description RPC 服务 - Sms 短信
+ *@Description RPC 服务 - Sms 短信
  *@author qsl
  *@date 2025/8/7 11:51
   *@param

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/InvokeContractCodeEnum.java

@@ -1,7 +1,7 @@
 package com.yc.ship.module.trade.enums;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 17:10
  */

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/TradeMqConstants.java

@@ -1,9 +1,9 @@
 package com.yc.ship.module.trade.enums;
 
 /**
- * @Description ：交易Mq常量
- * @Author ：qsl
- * @Date ：2025/6/21 09:23
+ * @Description ：交易Mq常量
+ * @Author ：qsl
+ * @Date ：2025/6/21 09:23
  */
 public class TradeMqConstants {
 

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/TradeOrderOperateTypeEnum.java

@@ -4,9 +4,9 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 /**
- * @Description 订单操作类型枚举
- * @Author qsl
- * @Date 2025/8/18 14:44
+ * @Description 订单操作类型枚举
+ * @Author qsl
+ * @Date 2025/8/18 14:44
  */
 @RequiredArgsConstructor
 @Getter

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/TradeOrderStatusEnum.java

@@ -10,28 +10,41 @@ import java.util.Arrays;
 /**
  * 交易订单 - 状态
  *
+ * @author qsl
  */
 @RequiredArgsConstructor
 @Getter
 public enum TradeOrderStatusEnum implements IntArrayValuable {
-
-    CANCELED(-2, "取消"),//主动取消、系统自动取消
-    FAIL(-1, "预定失败"),//供应商订单下单失败，造成订单失败
-    INIT(0, "待确认"),//通过规则、库存验证，等待供应商确认
-    UNPAID(1, "预定"),//已确认，等待支付
+    //主动取消、系统自动取消
+    CANCELED(-2, "取消"),
+    //供应商订单下单失败，造成订单失败
+    FAIL(-1, "预定失败"),
+    //通过规则、库存验证，等待供应商确认
+    INIT(0, "待确认"),
+    //已确认，等待支付
+    UNPAID(1, "预定"),
     PAYING(2, "支付中"),
     PAID(3, "已支付"),
-    PROCESSING(4, "预定中"),//供应商出票中
-    PROCESS_FAIL(5, "预定失败"),//供应商出票失败
+    //供应商出票中
+    PROCESSING(4, "预定中"),
+    //供应商出票失败
+    PROCESS_FAIL(5, "预定失败"),
     UNUSED(6, "确认"),
-    PART_CHECK(7, "部分核销"),//部分核销
-    ALL_CHECK(8, "全部核销"),//全部核销
-    PARTIAL_REFUND(9, "部分退款"),//部分退款， > 部分核销
-    REFUNDING(10, "退款中"),//退款中
-    ALL_REFUND(11, "全部退款"),//全部退款
-    EXPIRED(12, "已过期"),//订单未使用，但已不可整单退
-    TRANSFER(13, "已转交"),//订单已转交
-    YD(14, "初定");//订单已转交
+    //部分核销
+    PART_CHECK(7, "部分核销"),
+    //全部核销
+    ALL_CHECK(8, "全部核销"),
+    //部分退款， > 部分核销
+    PARTIAL_REFUND(9, "部分退款"),
+    //退款中
+    REFUNDING(10, "退款中"),
+    //全部退款
+    ALL_REFUND(11, "全部退款"),
+    //订单未使用，但已不可整单退
+    EXPIRED(12, "已过期"),
+    //订单修改审核
+    TRANSFER(13, "审核中"),
+    YD(14, "初定");
 
 
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(TradeOrderStatusEnum::getStatus).toArray();
@@ -50,13 +63,5 @@ public enum TradeOrderStatusEnum implements IntArrayValuable {
         return ARRAYS;
     }
 
-    /**
-     * 可转为全部核销的状态
-     * @param status 状态
-     * @return bool
-     */
-    public static boolean statusToAllCheck(int status) {
-       return PART_CHECK.getStatus().equals(status) || TRANSFER.getStatus().equals(status);
-    }
 
 }

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ota/QunarAccountConstant.java

@@ -1,7 +1,7 @@
 package com.yc.ship.module.trade.enums.ota;
 /**
  * 分销商-去哪儿-帐号版本配置项
- * @Description: yangtao
+ * @Description: qsl
  */
 public class QunarAccountConstant {
 

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ota/QunarCode.java

@@ -3,7 +3,7 @@ package com.yc.ship.module.trade.enums.ota;
  * 分销商-去哪儿-状态码
  * @Title: QunarCode.java
  * @Package: com.wisesoft.scenic.common
- * @Description: TODO
+ * @Description: TODO
  * @author: zhoulonggui
  * @date: 2017年5月22日 下午2:15:23
  * @version: V1.0

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/api/sms/SmsApiImpl.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 
 /***
- *@Description 短信公共服务
+ *@Description 短信公共服务
  *@author qsl
  *@date 2025/8/6 22:10
  *@param

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/contract/vo/ContractReqVO.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/3/20 16:49
  */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/market/RuleSpecNum.java

@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/11/26 16:00
  */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/PayOrderReqVO.java

@@ -9,9 +9,9 @@ import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 
 /**
- * @Description ：支付请求VO
- * @Author ：qsl
- * @Date ：2025/6/22 15:04
+ * @Description ：支付请求VO
+ * @Author ：qsl
+ * @Date ：2025/6/22 15:04
  */
 @Schema(description = "支付请求VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/PayOrderRespVO.java

@@ -7,9 +7,9 @@ import lombok.experimental.Accessors;
 import java.util.Map;
 
 /**
- * @Description ：支付返回VO
- * @Author ：qsl
- * @Date ：2025/6/22 15:04
+ * @Description ：支付返回VO
+ * @Author ：qsl
+ * @Date ：2025/6/22 15:04
  */
 @Schema(description = "支付返回VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/ShipTradeOrderCreateReqVO.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.trade.controller.admin.order.vo.order;
 import com.yc.ship.framework.common.validation.IntEnum;
 import com.yc.ship.framework.common.validation.Mobile;
 import com.yc.ship.module.trade.api.dto.TradeOrderCreateReqDTO;
+import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderBindDO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderCountryDO;
 import com.yc.ship.module.trade.enums.CredentialTypeEnum;
 import io.swagger.v3.oas.annotations.Hidden;
@@ -89,6 +90,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Schema(description = "是否改签 0 否 1是", example = "")
     private Integer isChange;
 
+    @Schema(description = "是否需要审核")
+    private Integer confirmType;
+
     @Schema(description = "是否预订单 0 否 1是", example = "")
     private Integer isYd;
 
@@ -137,6 +141,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Schema(description = "订单汇总信息")
     private TradeOrderTotalVO summary;
 
+    @Schema(description = "订单审核信息")
+    private TradeOrderBindDO tradeOrderBindDO;
+
 
     @Schema(description = "订单项")
     @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeDetailRespVO.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * @author aoxiang
+ * @author qsl
  * @description todo
  * @date 2025/7/22 16:10
  */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeMarketOrderRespVO.java

@@ -367,7 +367,7 @@ public class TradeMarketOrderRespVO {
     @Schema(description = "小程序子产品ID")
     private Long packProductId;
 
-    @Schema(description = "是否需要确认")
+    @Schema(description = "是否需要审核")
     private Integer confirmType;
 
     @Schema(description = "出行状态")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderPdaRespVO.java

@@ -402,8 +402,8 @@ public class TradeOrderPdaRespVO {
     @Schema(description = "小程序子产品ID")
     private Long packProductId;
 
-    @Schema(description = "是否需要确认")
-    @ExcelProperty("二次确认状态")
+    @Schema(description = "是否需要审核")
+    @ExcelProperty("订单审核状态")
     private Integer confirmType;
 
     @Schema(description = "出行状态")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespBakVO.java

@@ -405,8 +405,8 @@ public class TradeOrderRespBakVO {
     @Schema(description = "小程序子产品ID")
     private Long packProductId;
 
-    @Schema(description = "是否需要确认")
-    @ExcelProperty("二次确认状态")
+    @Schema(description = "是否需要审核")
+    @ExcelProperty("订单审核状态")
     private Integer confirmType;
 
     @Schema(description = "出行状态")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespVO.java

@@ -408,8 +408,8 @@ public class TradeOrderRespVO {
     @Schema(description = "小程序子产品ID")
     private Long packProductId;
 
-    @Schema(description = "是否需要确认")
-    @ExcelProperty("二次确认状态")
+    @Schema(description = "是否需要审核")
+    @ExcelProperty("订单审核状态")
     private Integer confirmType;
 
     @Schema(description = "出行状态")

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderTotalVO.java

@@ -83,6 +83,9 @@ public class TradeOrderTotalVO {
     @Schema(description = "订单总额")
     private BigDecimal orderMoney;
 
+    @Schema(description = "订单总额-前端修改")
+    private BigDecimal realAmount;
+
     @Schema(description = "实际总额")
     private BigDecimal realOrderMoney;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/rule/ProductSpecVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 
 /**
  * @description todo
- * @author      aoxiang
+ * @author      qsl
  * @date        2025/10/17 15:30
  */
 @Schema()

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/rule/RefundAuditNotifyReqVO.java

@@ -7,9 +7,9 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
- * @Description ：支付请求VO
- * @Author ：qsl
- * @Date ：2025/6/22 15:04
+ * @Description ：支付请求VO
+ * @Author ：qsl
+ * @Date ：2025/6/22 15:04
  */
 @Schema(description = "支付请求VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/order/TradeOrderController.java

@@ -28,9 +28,9 @@ import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.ge
 
 
 /**
- * @Description ：交易服务controller
- * @Author ：qsl
- * @Date ：2025/6/17 20:52
+ * @Description ：交易服务controller
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:52
  */
 @Tag(name = "交易服务controller")
 @RestController

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/order/TradeStandardSupplierController.java

@@ -19,9 +19,9 @@ import java.util.Map;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
 
 /**
- * @Description ：标准的供应商接入Controller
- * @Author ：qsl
- * @Date ：2025/8/15 20:52
+ * @Description ：标准的供应商接入Controller
+ * @Author ：qsl
+ * @Date ：2025/8/15 20:52
  */
 @Tag(name = "标准的供应商接入Controllerr")
 @RestController

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/OtaRelationController.java

@@ -17,16 +17,15 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.util.Map;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.TRADE;
 
 
 /**
- * @Description ：ota标准服务controller
- * @Author ：qsl
- * @Date ：2025/6/17 20:52
+ * @Description ：ota标准服务controller
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:52
  */
 @Tag(name = "ota标准服务")
 @RestController
@@ -65,7 +64,7 @@ public class OtaRelationController {
     public String xieCheng(
             @PathVariable("tenantId") Long tenantId, @PathVariable("path") String path,
             HttpServletRequest request, @RequestBody String body) {
-        log.info("携程-请求：tenantId" + tenantId + ";path=" + ";body=" + body);
+        log.info("携程-请求：tenantId{};path=;body={}", tenantId, body);
         return xieChengService.doRequest(tenantId, path, body, request);
     }
 
@@ -81,9 +80,8 @@ public class OtaRelationController {
     @Operation(summary ="美团-请求")
     @OperateLog(type = TRADE)
     public String meiTuan(@PathVariable("tenantId") Long tenantId, @PathVariable("path") String path, HttpServletRequest request, @RequestBody String jsonStr) {
-        log.error("[meiTuan]开始请求jsonStr:" + jsonStr);
-        String result = meiTuanService.doRequest(request, path, jsonStr, tenantId);
-        return result;
+        log.error("[meiTuan]开始请求jsonStr:{}", jsonStr);
+        return meiTuanService.doRequest(request, path, jsonStr, tenantId);
     }
 
 
@@ -95,7 +93,7 @@ public class OtaRelationController {
      * @return java.lang.String
      * @description 同程-请求
      *
-     * @date 2021/12/7 09:00
+     * @date 2025/12/7 09:00
      */
     @PostMapping(value = "/tongCheng/{tenantId}/{path}", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @Operation(summary ="同程-请求")
@@ -103,7 +101,7 @@ public class OtaRelationController {
     public String tongCheng(
             @PathVariable("tenantId") Long tenantId, @PathVariable("path") String path,
             HttpServletRequest request, @RequestBody String body) {
-        log.info("同程-请求：tenantId " + tenantId + ";body=" + body);
+        log.info("同程-请求：tenantId {};body={}", tenantId, body);
         return tongChengService.doRequest(tenantId, path, request, body);
     }
 
@@ -120,7 +118,7 @@ public class OtaRelationController {
     @Operation(summary ="抖音三方码-请求")
     @OperateLog(type = TRADE)
     public String tiktok(@PathVariable("tenantId") Long tenantId, @PathVariable("path") String path, HttpServletRequest request, @RequestBody String body) {
-        log.info("抖音三方码-请求：tenantId "+ tenantId + ";body=" + body);
+        log.info("抖音三方码-请求：tenantId {};body={}", tenantId, body);
         return tiktokLifeService.doRequest(tenantId, path, request, body, "");
     }
 
@@ -136,7 +134,7 @@ public class OtaRelationController {
     @Operation(summary ="抖音三方码(抖音来客版本)-请求")
     @OperateLog(type = TRADE)
     public String tiktokLife(@PathVariable("tenantId") Long tenantId, @PathVariable("path") String path, HttpServletRequest request, @RequestBody String body) {
-        log.info("抖音三方码(抖音来客版本)-请求：tenantId "+ tenantId + ";body=" + body);
+        log.info("抖音三方码(抖音来客版本)-请求：tenantId {};body={}", tenantId, body);
         return tiktokLifeService.doRequest(tenantId, path, request, body, "life");
     }
 
@@ -144,7 +142,7 @@ public class OtaRelationController {
     @Operation(summary ="抖音日历票(抖音来客版本)-请求")
     @OperateLog(type = TRADE)
     public String tiktokCalendar(@PathVariable("tenantId") Long tenantId, @PathVariable("path") String path, HttpServletRequest request, @RequestBody String body) {
-        log.info("抖音日历票(抖音来客版本)-请求：tenantId "+ tenantId + ";body=" + body);
+        log.info("抖音日历票(抖音来客版本)-请求：tenantId {};body={}", tenantId, body);
         String result = tiktokCalendarService.doRequestTiktokCalendar(tenantId, path, request, body);
         log.info("抖音日历票(抖音来客版本)-返回:{}",result);
         return result;
@@ -157,7 +155,7 @@ public class OtaRelationController {
     @OperateLog(type = TRADE)
     @ResponseBody
     public String doRequest(HttpServletRequest request, @PathVariable("tenementId") Long tenantId, @PathVariable("method") String method, @RequestBody String jsonStr) {
-        log.info("OTA统一分销接口：tenementId " + tenantId + ";method=" + method + ";body=" + jsonStr);
+        log.info("OTA统一分销接口：tenementId {};method={};body={}", tenantId, method, jsonStr);
         return zshlService.doRequest(request,tenantId,method, jsonStr);
     }
 
@@ -183,7 +181,6 @@ public class OtaRelationController {
     @ResponseBody
     public CommonResult<?> notify1(@RequestBody String jsonStr){
         try{
-            Map param = JSONUtil.toBean(jsonStr, Map.class);
             return CommonResult.success(true);
         }catch (Exception e){
             log.error("手动推送核销通知失败，",e);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaInnerBindVisitorVO.java

@@ -12,6 +12,9 @@ import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 
+/**
+ * @author qsl
+ */
 @Schema(description = "ota内部游客补录请求vo")
 @Data
 @Accessors(chain = true)

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaInnerOrderPayVO.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 /**
- * @Description ：ota内部下单支付VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description  ：ota内部下单支付VO
+ * @Author  ：qsl
+ * @Date  ：2025/6/17 20:56
  */
 @Schema(description = "ota内部下单支付VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaInnerOrderVO.java

@@ -11,9 +11,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * @Description ：ota内部下单VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota内部下单VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota内部下单创建 Request VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaInnerRefundVO.java

@@ -8,9 +8,9 @@ import javax.validation.constraints.NotEmpty;
 import java.util.List;
 
 /**
- * @Description ：ota内部退款VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota内部退款VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota内部退款 Request VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaInnerRefundVoucherVO.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import java.util.List;
 
 /**
- * @Description ：
- * @Author ：qsl
- * @Date ：2025/11/7 16:05
+ * @Description ：
+ * @Author ：qsl
+ * @Date ：2025/11/7 16:05
  */
 @Schema(description = "ota内部退款券码VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaStandardOrderPayRespVO.java

@@ -7,9 +7,9 @@ import lombok.experimental.Accessors;
 import java.util.List;
 
 /**
- * @Description ：ota下单支付响应VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota下单支付响应VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota下单支付 响应VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaStandardOrderRespVO.java

@@ -5,9 +5,9 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * @Description ：ota下单响应VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota下单响应VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota下单创建 响应VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaStandardOrderVO.java

@@ -4,9 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 /**
- * @Description ：ota下单VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota下单VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota下单创建 Request VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaStandardRefundRespVO.java

@@ -5,9 +5,9 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * @Description ：ota退款响应VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota退款响应VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota退款 响应VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/ota/vo/OtaVoucherVO.java

@@ -5,9 +5,9 @@ import lombok.Data;
 
 
 /**
- * @Description ：ota券码VO
- * @Author ：qsl
- * @Date ：2025/6/17 20:56
+ * @Description ：ota券码VO
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:56
  */
 @Schema(description = "ota券码VO")
 @Data

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/AppOtaTradeOrderController.java

@@ -20,9 +20,9 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
 
 
 /**
- * @Description ：旅行社APP交易服务controller, 自助机、小程序
- * @Author ：qsl
- * @Date ：2025/6/17 20:52
+ * @Description ：旅行社APP交易服务controller, 自助机、小程序
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:52
  */
 @Tag(name = "旅行社APP(OTA)交易服务")
 @RestController

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/AppOtcTradeOrderController.java

@@ -38,9 +38,9 @@ import static com.yc.ship.framework.web.core.util.WebFrameworkUtils.getLoginUser
 
 
 /**
- * @Description ：旅行社APP交易服务controller, 自助机、小程序
- * @Author ：qsl
- * @Date ：2025/6/17 20:52
+ * @Description ：旅行社APP交易服务controller, 自助机、小程序
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:52
  */
 @Tag(name = "旅行社APP(自助机、小程序)交易服务")
 @RestController

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/AppTradeOrderController.java

@@ -21,9 +21,9 @@ import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.API;
 
 
 /**
- * @Description ：旅行社APP交易服务controller, 自助机、小程序
- * @Author ：qsl
- * @Date ：2025/6/17 20:52
+ * @Description ：旅行社APP交易服务controller, 自助机、小程序
+ * @Author ：qsl
+ * @Date ：2025/6/17 20:52
  */
 @Tag(name = "旅行社APP(平台订单)交易服务")
 @RestController

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/pda/PdaController.java

@@ -41,7 +41,7 @@ import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_CANNOT_TOG
 
 /**
  * @author le'yang
- * @Description ：PDA服务controller,
+ * @Description ：PDA服务controller,
  */
 @Tag(name = "PDA服务")
 @RestController

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderBindDO.java

@@ -33,7 +33,7 @@ public class TradeOrderBindDO extends TenantBaseDO {
      */
     private Long orderId;
     /**
-     * 关联类型0订单关联 1调度 2改签 3增加产品或数量
+     * 关联类型1下单金额修改审核 2确定后修改审核信息
      */
     private Integer type;
     /**

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -233,7 +233,7 @@ public class TradeOrderDO extends TenantBaseDO {
     private BigDecimal platAmount;
 
     /**
-     * 是否需要确认0无需确认 1未确认 2已确认 3取消
+     * 是否需要审核0无需确认 1未确认 2已确认 3取消
      */
     @TableField(exist = false)
     private Integer confirmType;

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/ClientInfo.java

@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
  * 返回客户端信息工具类
  * @author lishiqiang 906534176@qq.com
  * @version V1.0
- * @Description:
+ * @Description:
  * @date 2017-11-24
  * @Copyright: www.lishiqiang.cn
  */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/ConfigUtils.java

@@ -10,9 +10,9 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 
 /**
- * @Description ：自定义参数工具
- * @Author ：qsl
- * @Date ：2025/6/11 10:33
+ * @Description ：自定义参数工具
+ * @Author ：qsl
+ * @Date ：2025/6/11 10:33
  */
 @Component
 public class ConfigUtils {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/ExceptionUtils.java

@@ -9,9 +9,9 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @Description ：TODO
- * @Author ：qsl
- * @Date ：2025/1/31 12:49
+ * @Description ：TODO
+ * @Author ：qsl
+ * @Date ：2025/1/31 12:49
  */
 @Slf4j
 public class ExceptionUtils {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/HttpClient.java

@@ -19,7 +19,7 @@ import java.security.cert.X509Certificate;
 /**
  * @author lishiqiang 906534176@qq.com
  * @version V1.0
- * @Description: http
+ * @Description: http
  * @date 2017-11-24
  * @Copyright: www.lishiqiang.cn
  */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/HttpClientUtil.java

@@ -19,7 +19,7 @@ import java.util.Map;
 /**
  * @author lishiqiang 906534176@qq.com
  * @version V1.0
- * @Description:
+ * @Description:
  * @date 2017-11-24
  * @Copyright: www.lishiqiang.cn
  */