Merge remote-tracking branch 'origin/main' into main

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/api/coupon/dto/DistributorRefundReqDto.java

@@ -0,0 +1,19 @@
+package com.yc.ship.module.marketing.api.coupon.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+@Schema(description = "RPC 服务 - 退款进入分销业务 Request DTO")
+@Data
+public class DistributorRefundReqDto {
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderId;
+
+    @Schema(description = "订单金额(元)，指当前订单支付金额，退款后的金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private BigDecimal orderAmount;
+
+    @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long productId;
+
+}

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/api/coupon/dto/DistributorReqDto.java

@@ -0,0 +1,26 @@
+package com.yc.ship.module.marketing.api.coupon.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Schema(description = "RPC 服务 - 下单进入分销业务 Request DTO")
+@Data
+public class DistributorReqDto {
+
+    @Schema(description = "分享的分销商ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long shareDistributorId;
+
+    @Schema(description = "订单ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long orderId;
+
+    @Schema(description = "订单金额(元)，指支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private BigDecimal orderAmount;
+
+    @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private Long productId;
+
+    @Schema(description = "游玩日期", example = "2022-01-01")
+    private String travelDate;
+}

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/api/coupon/dto/DistributorTemplateProductDto.java

@@ -0,0 +1,47 @@
+package com.yc.ship.module.marketing.api.coupon.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "RPC 服务 - 分销模板 Response DTO")
+@Data
+public class DistributorTemplateProductDto {
+
+    @Schema(description = "模板ID", example = "1024")
+    private Long templateId;
+
+    @Schema(description = "模板名称", example = "1024")
+    private String templateName;
+
+    @Schema(description = "分销类型", example = "1")
+    private Integer type;
+
+    @Schema(description = "标签ID", example = "1024")
+    private Long tagId;
+
+    @Schema(description = "模板优先级", example = "1024")
+    private Integer priorityLevel;
+
+    @Schema(description = "模板开始时间", example = "2025-01-01 00:00:00")
+    private LocalDateTime startTime;
+
+    @Schema(description = "模板结束时间", example = "2025-01-01 23:59:59")
+    private LocalDateTime endTime;
+
+    @Schema(description = "产品ID", example = "1024")
+    private Long productId;
+
+    @Schema(description = "佣金类型", example = "1")
+    private Integer bickbackType;
+
+    @Schema(description = "一级分佣比例", example = "1024")
+    private BigDecimal levelOne;
+
+    @Schema(description = "二级分佣比例", example = "1024")
+    private BigDecimal levelTwo;
+
+
+}

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/column/ColumnDO.java

@@ -10,7 +10,7 @@ import lombok.*;
 /**
  * 小程序-栏目管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("marketing_column")
 @KeySequence("marketing_column_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/coupon/CouponDO.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
 /**
  * 优惠券 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon")
 @KeySequence("coupon_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/couponAuditRecord/CouponAuditRecordDo.java

@@ -9,7 +9,7 @@ import lombok.*;
 /**
  * 优惠券 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon_audit_record")
 @KeySequence("coupon_audit_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/couponCode/CouponCodeDO.java

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
 /**
  * 优惠券 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon_code")
 @KeySequence("coupon_code_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/couponCodeUseRecord/CouponCodeUseRecordDO.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 /**
  * 优惠券 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon_code_use_record")
 @KeySequence("coupon_code_use_record_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/couponPorduct/CouponProductDo.java

@@ -9,7 +9,7 @@ import lombok.*;
 /**
  * 优惠券 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon_product")
 @KeySequence("coupon_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/couponpackage/CouponPackageDO.java

@@ -9,7 +9,7 @@ import lombok.*;
 /**
  * 优惠券-券包 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon_package")
 @KeySequence("coupon_package_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/dataobject/couponpackagecode/CouponPackageCodeDO.java

@@ -10,7 +10,7 @@ import lombok.experimental.Accessors;
 /**
  * 优惠券-券包领取码 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("coupon_package_code")
 @KeySequence("coupon_package_code_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/column/ColumnMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 小程序-栏目管理 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface ColumnMapper extends BaseMapperX<ColumnDO> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/coupon/CouponMapper.java

@@ -20,7 +20,7 @@ import java.util.Objects;
 /**
  * 优惠券 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponMapper extends BaseMapperX<CouponDO> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/couponAuditRecord/CouponAuditRecordMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 优惠券审核记录 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponAuditRecordMapper extends BaseMapperX<CouponAuditRecordDo> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/couponCode/CouponCodeMapper.java

@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * 优惠券码 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponCodeMapper extends BaseMapperX<CouponCodeDO> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/couponCodeUseRecord/CouponCodeUseRecordMapper.java

@@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 优惠券码使用记录 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponCodeUseRecordMapper extends BaseMapperX<CouponCodeUseRecordDO> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/couponProduct/CouponProductMapper.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 优惠券关联产品 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponProductMapper extends BaseMapperX<CouponProductDo> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/couponpackage/CouponPackageMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 优惠券-券包 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponPackageMapper extends BaseMapperX<CouponPackageDO> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/dal/mysql/couponpackagecode/CouponPackageCodeMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 优惠券-券包领取码 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface CouponPackageCodeMapper extends BaseMapperX<CouponPackageCodeDO> {

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/CouponCodeUseRecord/CouponCodeUseRecordService.java

@@ -9,7 +9,7 @@ import java.util.List;
 /**
  * 优惠券码使用记录 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponCodeUseRecordService {
     /**

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/CouponCodeUseRecord/CouponCodeUseRecordServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
 /**
  * 优惠券码使用记录 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/column/ColumnService.java

@@ -10,7 +10,7 @@ import javax.validation.Valid;
 /**
  * 小程序-栏目管理 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface ColumnService {
 

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/column/ColumnServiceImpl.java

@@ -18,7 +18,7 @@ import static com.yc.ship.module.marketing.enums.ErrorCodeConstants.COLUMN_NOT_E
 /**
  * 小程序-栏目管理 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/coupon/CouponService.java

@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * 优惠券 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponService {
 

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/coupon/CouponServiceImpl.java

@@ -48,7 +48,7 @@ import static com.yc.ship.module.member.enums.ErrorCodeConstants.AUTH_NOT_LOGIN;
 /**
  * 优惠券 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponAuditRecord/CouponAuditRecordService.java

@@ -6,7 +6,7 @@ import com.yc.ship.module.marketing.controller.admin.couponAuditRecord.vo.Coupon
 /**
  * 优惠券审核记录 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponAuditRecordService {
 

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponAuditRecord/CouponAuditRecordServiceImpl.java

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
 /**
  * 优惠券审核记录 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponCode/CouponCodeService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 优惠券码 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponCodeService {
     /**

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponCode/CouponCodeServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.List;
 /**
  * 优惠券码 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponProduct/CouponProductService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 优惠券关联产品 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponProductService {
 

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponProduct/CouponProductServiceImpl.java

@@ -27,7 +27,7 @@ import static com.yc.ship.module.marketing.enums.ErrorCodeConstants.COUPON_NOT_E
 /**
  * 优惠券关联产品 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponpackage/CouponPackageService.java

@@ -11,7 +11,7 @@ import javax.validation.Valid;
 /**
  * 优惠券-券包 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponPackageService {
 

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponpackage/CouponPackageServiceImpl.java

@@ -30,7 +30,7 @@ import static com.yc.ship.module.marketing.enums.ErrorCodeConstants.COUPON_PACKA
 /**
  * 优惠券-券包 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponpackagecode/CouponPackageCodeService.java

@@ -11,7 +11,7 @@ import java.util.List;
 /**
  * 优惠券-券包领取码 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface CouponPackageCodeService {
 

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponpackagecode/CouponPackageCodeServiceImpl.java

@@ -18,7 +18,7 @@ import static com.yc.ship.module.marketing.enums.ErrorCodeConstants.COUPON_PACKA
 /**
  * 优惠券-券包领取码 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-ota/ship-module-ota-api/pom.xml

@@ -38,6 +38,12 @@
             <version>2.2.20</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-core</artifactId>
+            <version>4.0.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

ship-module-ota/ship-module-ota-api/src/main/java/com/yc/ship/module/ota/api/OtaDistributorApi.java

@@ -1,9 +1,11 @@
 package com.yc.ship.module.ota.api;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
-import com.yc.ship.module.ota.api.dto.DistributorRechargeReqDTO;
-import com.yc.ship.module.ota.api.dto.DistributorRechargeRespDTO;
-import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
+import com.yc.ship.module.ota.api.dto.*;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
+
+import javax.validation.Valid;
+import java.util.List;
 
 public interface OtaDistributorApi {
     /**
@@ -12,6 +14,7 @@ public interface OtaDistributorApi {
      * @return
      */
     DistributorRespDTO getDistributorByLoginUserId(Long loginUserId);
+    DistributorRespDTO getDistributorById(Long id);
 
     /**
      * 分销商交易充值
@@ -19,4 +22,25 @@ public interface OtaDistributorApi {
      * @return
      */
     CommonResult<DistributorRechargeRespDTO> tradeRecharge(DistributorRechargeReqDTO rechargeReqDTO);
+
+    CommonResult<DistributorProductRespDTO> getDistributorProductById(Long distributorProductId);
+
+    CommonResult<List<DistributorProductRespDTO.DistributorProjectDTO>> getProductByDistributor(Long distributorId, Long productId, String distributorProductId);
+
+
+    CommonResult<DistributorProductRespDTO> getCalendarProductById(Long distributorProductId, String useDate);
+
+    CommonResult<DistributorRespDTO> getDistributorByOtaAccount(String otaAccount, String typeCode);
+
+    CommonResult<DistributorProductRespDTO> getAgencyCalendarRangeProductById(Long distributorProductId, String startDate, String endDate);
+
+    CommonResult<DistributorProductRespDTO> getDistributorProductByProductAndDistributor(Long productId, Long distributorId);
+
+    CommonResult<List<DistributorProductRespDTO>> getProductListPageByDistributorId(Long distributorId, int pageIndex, int pageSize);
+
+    CommonResult<DistributorRespDTO> getDistributorByAccountTenantId(Long accountTenantId);
+
+    CommonResult<?> distributorSelfRecharge(DistributorSelfRechargeReqDTO payNotifyReqDTO);
+
+    CommonResult<DistributorRespDTO> getDistributorByLoginUser(String loginName);
 }

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

@@ -33,5 +33,18 @@ public interface ErrorCodeConstants {
     ErrorCode DISTRIBUTOR_REQUEST_TIMEOUT = new ErrorCode(11_025, "分销商授信申请超时");
     ErrorCode DISTRIBUTOR_REQUEST_FAIL = new ErrorCode(11_026, "分销商授信请求失败");
     ErrorCode DISTRIBUTOR_SELF_RECHARGE_NOT_EXISTS = new ErrorCode(11_027, "分销商自助充值单不存在");
+    // ========== 扎帐 ==========
+    ErrorCode ACCOUNT_NOT_FAIL = new ErrorCode(30_201, "扎帐失败");
+    //========== 账单 ==========
+    ErrorCode BULL_NOT_FAIL = new ErrorCode(40_101, "账单生成失败");
+    //========== 营销政策 ==========
+    ErrorCode MARKETING_NOT_FAIL = new ErrorCode(50_101, "政策审核失败");
+    ErrorCode NOT_MARKETING = new ErrorCode(50_102, "未查询到可申请的营销政策");
+    ErrorCode NOT_MARKETING_USE = new ErrorCode(50_103, "未查询到可申请使用的营销政策");
+    ErrorCode ORDER_APPLIED_MARKETING = new ErrorCode(50_104, "订单已申请营销政策");
+    ErrorCode ORDER_APPLIED_MARKETING_USED = new ErrorCode(50_105, "订单已申请使用营销政策");
+    ErrorCode ORDER_NOT_MATCH_STORE = new ErrorCode(50_106, "订单与门店不匹配");
+    ErrorCode APPLY_MARKETING_NOT_FAIL = new ErrorCode(50_107, "申请政策失败");
+    ErrorCode ORDER_PAY_AUTO_REFUND = new ErrorCode(30_046, "当前订单已不能支付，系统将自动退款");
 
 }

ship-module-ota/ship-module-ota-biz/pom.xml

@@ -32,6 +32,16 @@
             <artifactId>ship-module-otc-api</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>ship-module-trade-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>ship-module-product-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.yc.ship</groupId>
             <artifactId>module-infra-api</artifactId>
@@ -127,6 +137,12 @@
             <groupId>com.anji-plus</groupId>
             <artifactId>captcha-spring-boot-starter</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yc.ship</groupId>-->
+<!--            <artifactId>ship-module-trade-biz</artifactId>-->
+<!--            <version>1.0.0</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
     </dependencies>
 
 </project>

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/api/OtaDistributorApiImpl.java

@@ -2,15 +2,21 @@ package com.yc.ship.module.ota.api;
 
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.util.object.BeanUtils;
-import com.yc.ship.module.ota.api.dto.DistributorRechargeReqDTO;
-import com.yc.ship.module.ota.api.dto.DistributorRechargeRespDTO;
-import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
+import com.yc.ship.module.ota.api.dto.*;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
+import com.yc.ship.module.ota.dal.mysql.distributor.DistributorMapper;
 import com.yc.ship.module.ota.service.distributor.DistributorService;
+import com.yc.ship.module.ota.service.distributorproduct.DistributorProductService;
 import com.yc.ship.module.ota.service.distributorrecharge.DistributorRechargeService;
+import com.yc.ship.module.ota.service.distributorselfrecharge.DistributorSelfRechargeService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
+
+import static com.yc.ship.framework.common.pojo.CommonResult.error;
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
 
 @Service
 public class OtaDistributorApiImpl implements OtaDistributorApi{
@@ -18,8 +24,16 @@ public class OtaDistributorApiImpl implements OtaDistributorApi{
     @Resource
     private DistributorService distributorService;
 
+    @Resource
+    private DistributorMapper distributorMapper;
+    @Resource
+    private DistributorProductService distributorProductService;
+
     @Resource
     private DistributorRechargeService distributorRechargeService;
+    @Resource
+    private DistributorSelfRechargeService distributorSelfRechargeService;
+
     @Override
     public DistributorRespDTO getDistributorByLoginUserId(Long loginUserId) {
         DistributorDO distributorDO = distributorService.getDistributorByLoginUserId(loginUserId);
@@ -33,4 +47,69 @@ public class OtaDistributorApiImpl implements OtaDistributorApi{
     public CommonResult<DistributorRechargeRespDTO> tradeRecharge(DistributorRechargeReqDTO rechargeReqDTO) {
         return distributorRechargeService.tradeRecharge(rechargeReqDTO);
     }
+
+
+
+    @Override
+    public DistributorRespDTO getDistributorById(Long distributorId) {
+        DistributorDO distributor = distributorService.getDistributorById(distributorId);
+        return BeanUtils.toBean(distributor, DistributorRespDTO.class);
+    }
+
+    @Override
+    public CommonResult<DistributorProductRespDTO> getDistributorProductById(Long distributorProductId) {
+        return distributorProductService.getDistributorProductById(distributorProductId);
+    }
+    @Override
+    public CommonResult<List<DistributorProductRespDTO.DistributorProjectDTO>> getProductByDistributor(Long distributortId, Long productId, String distributorProductId) {
+        List<DistributorProductRespDTO.DistributorProjectDTO> list =  distributorProductService.getProductByDistributor(distributortId, productId,distributorProductId);
+        return success(list);
+    }
+
+    @Override
+    public CommonResult<DistributorProductRespDTO> getCalendarProductById(Long distributorProductId, String useDate) {
+        return distributorProductService.getDistributorCalendarProductById(distributorProductId, useDate);
+    }
+
+    @Override
+    public CommonResult<DistributorRespDTO> getDistributorByOtaAccount(String otaAccount, String typeCode) {
+        return distributorService.getDistributorByOtaAccount(otaAccount, typeCode);
+    }
+
+    @Override
+    public CommonResult<DistributorProductRespDTO> getAgencyCalendarRangeProductById(Long distributorProductId, String startDate, String endDate) {
+        return distributorProductService.getAgencyCalendarRangeProductById(distributorProductId, startDate, endDate);
+    }
+
+    @Override
+    public CommonResult<DistributorProductRespDTO> getDistributorProductByProductAndDistributor(Long productId, Long distributorId) {
+        return distributorProductService.getDistributorProductByProductAndDistributor(productId, distributorId);
+    }
+
+    @Override
+    public CommonResult<List<DistributorProductRespDTO>> getProductListPageByDistributorId(Long distributorId, int pageIndex, int pageSize) {
+        return distributorProductService.getProductListPageByDistributorId(distributorId, pageIndex, pageSize);
+    }
+    @Override
+    @TenantIgnore
+    public CommonResult<DistributorRespDTO> getDistributorByAccountTenantId(Long accountTenantId) {
+        List<DistributorDO> distributor = distributorMapper.selectList(DistributorDO::getAccountTenantId, accountTenantId);
+        if(distributor!=null && distributor.size()>0){
+            return success(BeanUtils.toBean(distributor.get(0), DistributorRespDTO.class));
+        }else{
+            return error(500,"未查询到分销商信息");
+        }
+
+    }
+    @Override
+    public CommonResult<?> distributorSelfRecharge(DistributorSelfRechargeReqDTO payNotifyReqDTO) {
+        Long id = distributorSelfRechargeService.distributorSelfRecharge(payNotifyReqDTO.getOrderId(), payNotifyReqDTO.getPayOrderId(), payNotifyReqDTO.getPayStatus());
+        return CommonResult.success(id);
+    }
+    @Override
+    public CommonResult<DistributorRespDTO> getDistributorByLoginUser(String loginName) {
+        DistributorDO distributor = distributorService.getDistributorByLoginUser(loginName);
+        return CommonResult.success(BeanUtils.toBean(distributor, DistributorRespDTO.class));
+    }
+
 }

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

@@ -8,7 +8,7 @@ import java.math.BigDecimal;
 /**
  * @author aoxiang
  * @description todo
- * @date 2024/9/2 15:48
+ * @date 2025/9/2 15:48
  */
 @Schema(description = "RPC 服务 - Product 产品规格信息 Response DTO")
 @Data

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/mysql/distributor/DistributorMapper.java

@@ -1,6 +1,7 @@
 package com.yc.ship.module.ota.dal.mysql.distributor;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yc.ship.framework.common.pojo.PageResult;
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
 import com.yc.ship.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -10,6 +11,8 @@ import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorPageReq
 import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorRespVO;
 import com.yc.ship.module.ota.controller.admin.distributor.vo.DistributorSaveReqVO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
+import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
+import com.yc.ship.module.trade.api.dto.StoreRespVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -39,8 +42,10 @@ public interface DistributorMapper extends BaseMapperX<DistributorDO> {
                 .orderByDesc(DistributorDO::getId));
     }
 
-
-
+    @TenantIgnore
+    List<StoreRespVO> selectDistributorStore(@Param("tenantId") Long tenantId);
+    @TenantIgnore
+    StoreRespVO selectStore(@Param("id") Long id);
     default List<DistributorDO> getSimpleList(DistributorListReqVO reqVO) {
         LambdaQueryWrapperX<DistributorDO> queryWrapper = new LambdaQueryWrapperX<>();
         queryWrapper.likeIfPresent(DistributorDO::getName, reqVO.getName());
@@ -91,7 +96,26 @@ public interface DistributorMapper extends BaseMapperX<DistributorDO> {
 
     DistributorRespVO queryDistributorMoneyTotal(@Param("distributorId")Long distributorId);
 
+    @TenantIgnore
+    List<DistributorDO> getPlatTenantId(@Param("currentTenantId") Long currentTenantId);
+
+    @TenantIgnore
+    DistributorDO getDistributorByTenantId(@Param("tenantId") Long tenantId);
+    @TenantIgnore
+    Long getProductId(@Param("productId") Long productId);
     default DistributorDO selectByUserId(Long loginUserId) {
         return selectOne(DistributorDO::getUserId, loginUserId);
     }
+
+    @TenantIgnore
+    IPage<ProductSpuRespDTO> getOtaProductPage(IPage<ProductSpuRespDTO> page, @Param("vo") DistributorPageReqVO vo, @Param("distributorId") Long distributorId);
+
+    @TenantIgnore
+    DistributorDO getDistributor(@Param("userName") String userName);
+
+    @TenantIgnore
+    List<ProductSpuRespDTO> selectOtaSpuList(@Param("categoryId") Long categoryId, @Param("distributorId") Long distributorId, @Param("useDate") String useDate);
+
+
+
 }

ship-module-ota/ship-module-ota-biz/src/main/resources/mapper/distributor/DistributorMapper.xml

@@ -120,4 +120,84 @@
         FROM ota_distributor_recharge
         WHERE `status` = 1 and deleted = 0 and distributor_id = #{distributorId}
     </select>
+
+    <select id="getPlatTenantId" resultType="com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO">
+        select * from ota_distributor where account_tenant_id = #{currentTenantId} limit 1
+    </select>
+    <select id="getDistributorByTenantId"
+            resultType="com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO">
+        SELECT od.*
+        FROM ota_distributor od where od.account_tenant_id=#{tenantId} limit 1
+    </select>
+    <select id="getProductId" resultType="java.lang.Long">
+        select product_id from ota_distributor_product where id = #{productId} limit 1
+    </select>
+    <select id="getOtaProductPage"
+            resultType="com.yc.ship.module.product.api.dto.ProductSpuRespDTO">
+        SELECT ps.*,td.id distributorProductId,sk.spec_type,td.start_date,td.end_date
+        FROM ota_distributor_product td
+        INNER JOIN product_spu ps on td.product_id = ps.id
+        LEFT  JOIN product_sku sk on sk.id = td.product_sku_id
+        where 1= 1  and td.deleted = 0
+        <if test="vo.productName != null and vo.productName != ''">
+            AND ps.product_name = #{vo.productName}
+        </if>
+        <if test="vo.orderStatus != null and vo.orderStatus != ''">
+            AND td.is_use = #{vo.orderStatus}
+        </if>
+        <if test="vo.type == 1">
+            AND td.distributor_id = #{distributorId}
+        </if>
+    </select>
+    <select id="getDistributor"
+            resultType="com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO">
+        SELECT od.*
+        FROM ota_distributor od where od.login_name=#{userName} and od.deleted = 0
+    </select>
+    <select id="selectOtaSpuList"
+            resultType="com.yc.ship.module.product.api.dto.ProductSpuRespDTO">
+        SELECT
+        p.id,
+        p.product_name productName,
+        p.product_code productCode,
+        p.product_type productType,
+        p.category_id categoryId,
+        p.sort_num sortNum,
+        p.is_validated isValidated,
+        odp.is_use isUse,
+        odp.is_use_otc isUseOtc,
+        odp.sale_price salePrice,
+        odp.cost_price costPrice,
+        odp.product_sku_id productSkuId,
+        pk.spec_type,
+        pc.cate_name categoryName
+        FROM
+        product_spu p
+        INNER JOIN ota_distributor_product odp ON odp.product_id = p.id
+        INNER JOIN ota_distributor od ON od.id = odp.distributor_id
+        INNER JOIN product_sku pk ON pk.id = odp.product_sku_id
+        INNER JOIN product_category pc ON pc.id = p.category_id
+        WHERE
+        od.deleted = 0
+        AND od.is_use = 1
+        AND odp.is_use_otc = 1
+        AND odp.is_use = 1
+        <if test="categoryId != null and categoryId != ''">
+            AND pc.id = #{categoryId}
+        </if>
+        <if test="useDate != null and useDate != ''">
+            AND p.id in (
+            SELECT product_id as id FROM stock_day_product WHERE is_use = 1 and use_date = #{useDate}
+            union ALL
+            SELECT business_id as id FROM stock_day_config WHERE type = 0 and deleted = 0
+            and start_date <![CDATA[ <= ]]> #{useDate} AND end_date <![CDATA[ >= ]]> #{useDate}
+            union ALL
+            SELECT product_id as id FROM stock_day_product_distributor WHERE deleted = 0 and use_date = #{useDate}
+            )
+        </if>
+        AND odp.deleted = 0
+        AND p.deleted = 0
+        AND od.id = #{distributorId}
+        ORDER BY p.id,p.update_time
+    </select>
 </mapper>

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

@@ -11,7 +11,7 @@ import javax.annotation.security.PermitAll;
 /**
  * @author ：yaochao
  * @description ：TODO
- * @date ：2024/8/7 13:40
+ * @date ：2025/8/7 13:40
  */
 @Tag(name = "RPC 服务 - 链接")
 public interface LinkApi {

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

@@ -12,7 +12,7 @@ import javax.annotation.security.PermitAll;
 /**
  * @author ：yaochao
  * @description ：TODO
- * @date ：2024/8/7 13:40
+ * @date ：2025/8/7 13:40
  */
 @Tag(name = "RPC 服务 - 门店")
 public interface StoreApi {

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

@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * @author aoxiang
  * @description todo
- * @date 2024/12/26 10:09
+ * @date 2025/12/26 10:09
  */
 @Schema(description = "RPC 服务 - 门店资金卡信息Request DTO")
 @Data

ship-module-otc/ship-module-otc-api/src/main/java/com/yc/ship/module/otc/enums/StoreBalanceTypeEnum.java

@@ -9,7 +9,7 @@ import java.util.Arrays;
 /**
  * @author ：yaochao
  * @description ：TODO
- * @date ：2024/8/6 15:48
+ * @date ：2025/8/6 15:48
  */
 @RequiredArgsConstructor
 @Getter

ship-module-otc/ship-module-otc-api/src/main/java/com/yc/ship/module/otc/enums/StoreCreditTypeEnum.java

@@ -9,7 +9,7 @@ import java.util.Arrays;
 /**
  * @author ：yaochao
  * @description ：TODO
- * @date ：2024/8/6 15:48
+ * @date ：2025/8/6 15:48
  */
 @RequiredArgsConstructor
 @Getter

ship-module-otc/ship-module-otc-api/src/main/java/com/yc/ship/module/otc/enums/TradeModeEnum.java

@@ -8,7 +8,7 @@ import java.util.Arrays;
 /**
  * @author ：yaochao
  * @description ：TODO
- * @date ：2024/8/6 15:48
+ * @date ：2025/8/6 15:48
  */
 @RequiredArgsConstructor
 @Getter

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

@@ -15,8 +15,8 @@ import static com.yc.ship.module.otc.enums.ErrorCodeConstants.AGENCY_LOGIN_LOG_E
 
 /**
  * @Description 旅行社授权接口
- * @Author Rocky Liu
- * @Date 2024/6/4 15:28
+ * @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

@@ -26,8 +26,8 @@ import static com.yc.ship.framework.common.util.collection.CollectionUtils.conve
 
 /**
  * @Description 旅行社授权接口
- * @Author Rocky Liu
- * @Date 2024/6/4 15:28
+ * @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,8 +41,8 @@ import static com.yc.ship.module.otc.enums.ErrorCodeConstants.*;
 
 /**
  * @Description 旅行社授权接口
- * @Author Rocky Liu
- * @Date 2024/6/4 15:28
+ * @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/service/storeaudit/StoreAuditServiceImpl.java

@@ -124,7 +124,7 @@ public class StoreAuditServiceImpl implements StoreAuditService {
             int operateType = updateReqVO.getOperateType();
             int type = operateType == 1 ? 1 : operateType == 2 ? 2 : 99;
             TradeModeEnum tradeModeEnum = TradeModeEnum.valueOf(operateType, type, updateReqVO.getOperateMode());
-            //现在没有授信充值了 2024-12-23，授信还款只能根据账单
+            //现在没有授信充值了 2025-12-23，授信还款只能根据账单
             Long logId;
             if(tradeModeEnum == TradeModeEnum.BALANCE_ADMIN_RECHARGE_1 || tradeModeEnum == TradeModeEnum.BALANCE_ADMIN_RECHARGE_2
                     || tradeModeEnum == TradeModeEnum.QUOTA_1 || tradeModeEnum == TradeModeEnum.QUOTA_2){

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

@@ -0,0 +1,31 @@
+package com.yc.ship.module.product.api;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.module.product.api.dto.*;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import java.util.Collection;
+import java.util.List;
+
+@Tag(name = "API 服务 - 订单")
+public interface ProductApi {
+
+
+    List<ProductSpuRespDTO> getProductListByTenantId( Long tenantId);
+
+    List<ProductSpuRespDTO> getProductList(Collection<Long> ids);
+
+
+    CommonResult<ProductCheckChannelRespDTO> getProductCheckChannel(Long productBaseId, Long channelId);
+
+    CommonResult<ProductBaseRespDTO> getProductBaseById(Long baseId);
+    CommonResult<ProductSpuRespDTO> getCalendarProduct(Long id,String useDate);
+
+    CommonResult<ProductSpuRespDTO> getCalendarProduct(Long id, String useDate, Long routePlanId);
+
+    CommonResult<ProductSpuRespDTO> getProduct(Long id);
+
+    CommonResult<CategoryRespDTO> getCategory(Long id);
+
+    CommonResult<List<CategoryRespDTO>> getCategoryListByIds(Integer type, List<Long> ids);
+}

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

@@ -0,0 +1,54 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 小程序产品分类 Response VO")
+@Data
+public class CategoryExtraRespDTO {
+
+    @Schema(description = "同product_category主键", example = "23952")
+    private Long id;
+
+    @Schema(description = "分类描述", example = "你说的对")
+    private String description;
+
+    @Schema(description = "产品类型", example = "2")
+    private Long type;
+
+    @Schema(description = "商品类型 1.票务类 2.文创类 3.酒店类 4.餐饮类")
+    private Integer spuType;
+
+    @Schema(description = "评价类型")
+    private String evaluateType;
+
+    @Schema(description = "经纬度")
+    private String coordinate;
+
+    @Schema(description = "标签")
+    private String tags;
+
+    @Schema(description = "栏目ID")
+    private String columns;
+
+    @Schema(description = "地址")
+    private String address;
+
+    @Schema(description = "封面图")
+    private String img;
+
+    @Schema(description = "产品简介")
+    private String profile;
+
+    @Schema(description = "产品详情")
+    private String details;
+
+    @Schema(description = "启用热门推荐")
+    private Integer enableHotAds;
+
+    /**
+     * 关联子产品
+     */
+    @Schema(description = "小程序产品关联子产品")
+    private String appletProducts;
+}

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

@@ -0,0 +1,17 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "RPC 服务 - Category 产品分组/资源 Request DTO")
+@Data
+public class CategoryReqDTO {
+    @Schema(description = "父ID", example = "27454")
+    private Long parentId;
+
+    @Schema(description = "类型;0资源分类 1产品分类 2小程序产品分类", example = "1")
+    private Integer type;
+
+    @Schema(description = "栏目ID", example = "2")
+    private Long columns;
+}

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

@@ -0,0 +1,52 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Schema(description = "RPC 服务 - Category 产品分组/资源 Response VO")
+@Data
+public class CategoryRespDTO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21187")
+    private Long id;
+
+    @Schema(description = "父ID", example = "27454")
+    private Long parentId;
+
+    @Schema(description = "状态", example = "2")
+    private Integer useStatus;
+
+    @Schema(description = "编码")
+    private String cateCode;
+
+    @Schema(description = "分类名称", example = "芋艿")
+    private String cateName;
+
+    @Schema(description = "排序号")
+    private Integer sortNum;
+
+    @Schema(description = "类型;0资源分类 1产品分类 2小程序产品分类", example = "1")
+    private Integer type;
+
+    @Schema(description = "父路径;逗号分隔")
+    private String parentPath;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "关联资源数量")
+    private Integer resourceNum;
+
+    @Schema(description = "小程序信息")
+    private CategoryExtraRespDTO extraInfo;
+
+    @Schema(description = "分类产品集合")
+    private List<ProductSpuRespDTO> productSpuRespDTOList;
+
+    @Schema(description = "分类产品集合")
+    private List<Map<String, Object>> spuList;
+}

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

@@ -0,0 +1,27 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 产品检票通道 Response VO")
+@Data
+public class CheckChannelRespDTO {
+
+    @Schema(description = "主键", example = "24023")
+    private Long id;
+
+    @Schema(description = "产品ID;基础产品或者组合产品", example = "31571")
+    private Long productId;
+
+    @Schema(description = "通道ID", example = "30582")
+    private Long channelId;
+
+    @Schema(description = "检票次数")
+    private Integer checkTimes;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/PlatProductRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductBasePriceRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductBaseRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -81,5 +81,11 @@ public class ProductBaseRespDTO {
     @Schema(description = " 基础产品价格")
     private List<ProductBasePriceRespDTO> basePriceList;
 
+    @Schema(description = " 产品检票通道")
+    private List<CheckChannelRespDTO> checkChannelList;
+
+    @Schema(description = "资源列表")
+    private List<ResourceSimpleRespDTO> resourceList;
+
 
 }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductBasicRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductCheckChannelRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductCheckRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductGroupRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductNoticeRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductOtherRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductRefundRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductSaleRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductSkuRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductSpuRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/ProductTakeRuleRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

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

@@ -0,0 +1,31 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 资源信息 Response VO")
+@Data
+public class ResourceSimpleRespDTO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "6825")
+    private Long id;
+
+    @Schema(description = "名称", example = "赵六")
+    private String name;
+
+    @Schema(description = "资源对接类型:0系统未对接 1系统直连", example = "0")
+    private Integer accessType;
+
+    @Schema(description = "资源类型:0内部资源，1外部资源", example = "0")
+    private Integer sourceType;
+
+    @Schema(description = "类别ID", example = "0")
+    private Long categoryId;
+
+    @Schema(description = "供应商ID", example = "10875")
+    private Long supplierId;
+
+    @Schema(description = "供应商名称")
+    private String supplierName;
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/spuVO/RoutePlanRespDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.product.controller.admin.productSpu.spuVO;
+package com.yc.ship.module.product.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
 /**
  * @author aoxiang
  * @description todo
- * @date 2024/7/30 15:44
+ * @date 2025/7/30 15:44
  */
 @Schema(description = "RPC 服务 - Product 出行方案 Response DTO")
 @Data

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

@@ -0,0 +1,101 @@
+package com.yc.ship.module.product.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ *
+ * @author le'yang
+ */
+@Schema(description = "RPC 服务 - 供应商 Response DTO")
+@Data
+public class SupplierRespDTO {
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10823")
+    private Long id;
+
+    @Schema(description = "供应商名称", example = "张三")
+    private String name;
+    @Schema(description = "简称", example = "张三")
+    private String shortName;
+
+    @Schema(description = "供应商类型（0：内部供应商，1：外部供应商）", example = "2")
+    private Integer type;
+
+    @Schema(description = "合作状态（0：合作中止，1：合作中）", example = "2")
+    private Integer useStatus;
+
+    @Schema(description = "合作开始时间")
+    private LocalDateTime cooperateStartTime;
+
+    @Schema(description = "合作结束时间")
+    private LocalDateTime cooperateEndTime;
+
+    @Schema(description = "联系人")
+    private String contactMan;
+
+    @Schema(description = "联系电话")
+    private String contactPhone;
+
+    @Schema(description = "联系地址")
+    private String contactAddress;
+
+    @Schema(description = "业务区域")
+    private String businessArea;
+
+    @Schema(description = "合同")
+    private String contract;
+
+    @Schema(description = "是否系统直连（0：否，1-是）")
+    private Integer isSystemDirect;
+
+    @Schema(description = "系统直连参数")
+    private String directParam;
+
+    @Schema(description = "系统直连账号", example = "4537")
+    private String directAccount;
+
+    @Schema(description = "系统直连下单地址", example = "https://www.iocoder.cn")
+    private String directOrderUrl;
+
+    @Schema(description = "系统直连核销地址", example = "https://www.iocoder.cn")
+    private String directCheckUrl;
+
+    @Schema(description = "系统直连退票地址", example = "https://www.iocoder.cn")
+    private String directRefundUrl;
+
+    @Schema(description = "直连供应商系统", example = "OtaService")
+    private String directServer;
+
+    @Schema(description = "提供资源类型", example = "2")
+    private String resourceCategory;
+
+    @Schema(description = "单位名称（同供应商名称）", example = "王五")
+    private String unitName;
+
+    @Schema(description = "单位地址")
+    private String unitAddress;
+
+    @Schema(description = "开户行", example = "赵六")
+    private String bankName;
+
+    @Schema(description = "银行账户", example = "14227")
+    private String bankAccount;
+
+    @Schema(description = "税号", example = "6791")
+    private String taxId;
+
+    @Schema(description = "电话")
+    private String telephone;
+
+    @Schema(description = "联行号")
+    private String interbankNumber;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "提供资源类型", example = "2")
+    private List<Long> resourceType;
+}

ship-module-product/ship-module-product-biz/pom.xml

@@ -131,6 +131,12 @@
             <groupId>com.anji-plus</groupId>
             <artifactId>captcha-spring-boot-starter</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>ship-module-ota-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/ProductApiImpl.java

@@ -0,0 +1,145 @@
+package com.yc.ship.module.product.api;
+
+import cn.hutool.core.date.DateUtil;
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.util.date.DateUtils;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.framework.tenant.core.util.TenantUtils;
+import com.yc.ship.module.ota.api.OtaDistributorApi;
+import com.yc.ship.module.ota.api.dto.DistributorProductRespDTO;
+import com.yc.ship.module.product.api.dto.*;
+import com.yc.ship.module.product.controller.admin.productBase.vo.ProductBaseRespVO;
+import com.yc.ship.module.product.controller.admin.productSpu.groupVO.ProductGroupRespVO;
+import com.yc.ship.module.product.controller.admin.productSpu.spuVO.ProductSpuRespVO;
+import com.yc.ship.module.product.dal.dataobject.productSpu.ProductSpuDO;
+import com.yc.ship.module.product.dal.mysql.productGroup.ProductGroupMapper;
+import com.yc.ship.module.product.service.productBase.ProductBaseService;
+import com.yc.ship.module.product.service.productSpu.ProductSpuService;
+import com.yc.ship.module.resource.controller.admin.category.vo.CategoryListReqVO;
+import com.yc.ship.module.resource.controller.admin.category.vo.CategoryRespVO;
+import com.yc.ship.module.resource.dal.dataobject.category.CategoryDO;
+import com.yc.ship.module.resource.dal.dataobject.category.CategoryExtraDO;
+import com.yc.ship.module.resource.dal.dataobject.checkchannel.CheckChannelDO;
+import com.yc.ship.module.resource.service.category.CategoryExtraService;
+import com.yc.ship.module.resource.service.category.CategoryService;
+import com.yc.ship.module.resource.service.checkchannel.CheckChannelService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+/**
+ * @author ：qsl
+ * @description：TODO
+ * @date ：2025/8/12 09:47
+ **/
+@Service
+public class ProductApiImpl implements ProductApi {
+
+    @Resource
+    private ProductSpuService productSpuService;
+    @Resource
+    private CheckChannelService checkChannelService;
+    @Resource
+    private ProductBaseService productBaseService;
+    @Resource
+    private CategoryService categoryService;
+    @Resource
+    private CategoryExtraService categoryExtraService;
+    @Resource
+    private OtaDistributorApi otaDistributorApi;
+    @Resource
+    private ProductGroupMapper productGroupMapper;
+
+    @Override
+    public List<ProductSpuRespDTO> getProductListByTenantId(Long tenantId) {
+        return productSpuService.getProductListByTenantId(tenantId).getData();
+    }
+
+    @Override
+    public List<ProductSpuRespDTO> getProductList(Collection<Long> ids) {
+        List<ProductSpuDO> spuList = productSpuService.getProductList(ids);
+        return BeanUtils.toBean(spuList, ProductSpuRespDTO.class);
+
+    }
+
+    @Override
+    public CommonResult<ProductCheckChannelRespDTO> getProductCheckChannel(Long productId, Long channelId) {
+        CheckChannelDO checkChannelDO = checkChannelService.getCheckChannelByChannelAndProduct(productId, channelId);
+        return success(BeanUtils.toBean(checkChannelDO, ProductCheckChannelRespDTO.class));
+    }
+
+    @Override
+    public CommonResult<ProductBaseRespDTO> getProductBaseById(Long baseId) {
+        ProductBaseRespVO base = productBaseService.getBase(baseId);
+        return success(BeanUtils.toBean(base, ProductBaseRespDTO.class));
+    }
+
+    @Override
+    public CommonResult<ProductSpuRespDTO> getCalendarProduct(Long id, String useDate) {
+        return getCalendarProduct(id, useDate, null);
+    }
+    @Override
+    public CommonResult<ProductSpuRespDTO> getCalendarProduct(Long id, String useDate, Long routePlanId) {
+        if(useDate!=null){
+            ProductSpuRespVO productSpuResp = productSpuService.getProductSpuResp(id, useDate,routePlanId);
+            List<CategoryRespVO> list = categoryService.getCategoryRespListByIds(productSpuResp.getCategoryId());
+            String newName = list.stream().map(CategoryRespVO::getCateName).collect(Collectors.joining());
+            productSpuResp.setProductName(newName+"-"+productSpuResp.getProductName());
+            ProductSpuRespDTO spuRespDTO = BeanUtils.toBean(productSpuResp, ProductSpuRespDTO.class);
+            return success(spuRespDTO);
+        }
+        return getProduct(id);
+    }
+    @Override
+    public CommonResult<ProductSpuRespDTO> getProduct(Long id) {
+        String date = DateUtil.format(DateUtil.date(), DateUtils.FORMAT_YEAR_MONTH_DAY);
+        ProductSpuRespVO productSpuResp = productSpuService.getProductSpuResp(id,date,null);
+        ProductSpuRespDTO spuRespDTO = BeanUtils.toBean(productSpuResp, ProductSpuRespDTO.class);
+        // 查询分销产品规格信息
+        if (spuRespDTO !=null) {
+            spuRespDTO.getPlatProductList().forEach(item -> {
+                DistributorProductRespDTO productRespDTO = otaDistributorApi.getDistributorProductById(item.getProductBaseId()).getCheckedData();
+                TenantUtils.execute(productRespDTO.getTenantId(),()->{
+                    List<ProductGroupRespVO> groupList = productGroupMapper.selectSpuGroupList(productRespDTO.getProductId(),null);
+                    item.setProductGroupList(BeanUtils.toBean(groupList, ProductGroupRespDTO.class));
+                });
+            });
+        }
+        return success(spuRespDTO);
+    }
+    @Override
+    public CommonResult<CategoryRespDTO> getCategory(Long id) {
+        CategoryDO category = categoryService.getCategory(id);
+        if(category!=null) {
+            CategoryRespDTO respDTO = BeanUtils.toBean(category, CategoryRespDTO.class);
+            CategoryExtraDO extraInfo = categoryExtraService.getCategoryExtra(id);
+            respDTO.setExtraInfo(BeanUtils.toBean(extraInfo, CategoryExtraRespDTO.class));
+            return success(respDTO);
+        }
+        return null;
+
+    }
+
+    @Override
+    public CommonResult<List<CategoryRespDTO>> getCategoryListByIds(Integer type, List<Long> ids) {
+        CategoryListReqVO reqVO = new CategoryListReqVO();
+        reqVO.setType(type);
+        reqVO.setIds(ids);
+        List<CategoryRespVO> listByIds = categoryService.getListByIds(reqVO);
+        List<CategoryRespDTO> categoryRespDTOS = BeanUtils.toBean(listByIds, CategoryRespDTO.class);
+        if (type == 2) {
+            // 小程序分类型信息
+            for (CategoryRespDTO categoryRespDTO : categoryRespDTOS) {
+                CategoryExtraDO extraDO = categoryExtraService.getCategoryExtra(categoryRespDTO.getId());
+                categoryRespDTO.setExtraInfo(BeanUtils.toBean(extraDO, CategoryExtraRespDTO.class));
+            }
+        }
+        return CommonResult.success(categoryRespDTOS);
+    }
+
+}

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/controller/admin/productSpu/groupVO/PlatProductRespVO.java

@@ -2,7 +2,7 @@ package com.yc.ship.module.product.controller.admin.productSpu.groupVO;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.yc.ship.module.product.controller.admin.productSpu.spuVO.ProductGroupRespDTO;
+import com.yc.ship.module.product.api.dto.ProductGroupRespDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/dataobject/voyage/VoyageDO.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 航次管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName(value = "product_voyage",autoResultMap = true)
 @KeySequence("product_voyage_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/dal/mysql/voyage/VoyageMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 /**
  * 航次管理 Mapper
  *
- * @author flycloud
+ * @author lfy
  */
 @Mapper
 public interface VoyageMapper extends BaseMapperX<VoyageDO> {

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/productSpu/ProductSpuService.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.product.service.productSpu;
 import cn.hutool.core.lang.tree.TreeNode;
 import com.yc.ship.framework.common.pojo.CommonResult;
 import com.yc.ship.framework.common.pojo.PageResult;
+import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
 import com.yc.ship.module.product.controller.admin.productSpu.spuVO.*;
 import com.yc.ship.module.product.dal.dataobject.productSku.ProductSkuDO;
 import com.yc.ship.module.product.dal.dataobject.productSpu.ProductSpuDO;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/productSpu/ProductSpuServiceImpl.java

@@ -20,6 +20,7 @@ import com.yc.ship.framework.security.core.util.SecurityFrameworkUtils;
 import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.framework.tenant.core.context.TenantContextHolder;
 import com.yc.ship.framework.tenant.core.util.TenantUtils;
+import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
 import com.yc.ship.module.product.controller.admin.productSpu.baseRuleVO.ProductBasicRuleRespVO;
 import com.yc.ship.module.product.controller.admin.productSpu.checkRuleVO.ProductCheckRuleRespVO;
 import com.yc.ship.module.product.controller.admin.productSpu.groupVO.*;

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageService.java

@@ -10,7 +10,7 @@ import javax.validation.Valid;
 /**
  * 航次管理 Service 接口
  *
- * @author flycloud
+ * @author lfy
  */
 public interface VoyageService {
 

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyage/VoyageServiceImpl.java

@@ -17,7 +17,7 @@ import static com.yc.ship.module.product.enums.ErrorCodeConstants.VOYAGE_NOT_EXI
 /**
  * 航次管理 Service 实现类
  *
- * @author flycloud
+ * @author lfy
  */
 @Service
 @Validated

ship-module-resource/ship-module-resource-api/pom.xml

@@ -40,6 +40,12 @@
             <version>2.2.20</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.yc.ship</groupId>
+            <artifactId>ship-module-product-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/ResourceApi.java

@@ -0,0 +1,18 @@
+package com.yc.ship.module.resource;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.module.product.api.dto.SupplierRespDTO;
+import com.yc.ship.module.resource.api.dto.CheckMachineDTO;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@Tag(name = "API 服务 - 订单")
+public interface ResourceApi {
+
+
+    CommonResult<SupplierRespDTO> getSupplierById(Long supplierId);
+
+    CommonResult<?> getCheckMachineInfo(Integer siteType,String machineId);
+
+
+    CommonResult<CheckMachineDTO> getCheckMachine(Integer type, String machineId, Long tenantId);
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/vo/CheckMachineDTO.java

@@ -1,4 +1,4 @@
-package com.yc.ship.module.resource.controller.admin.vo;
+package com.yc.ship.module.resource.api.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/api/ResourceApiImpl.java

@@ -0,0 +1,48 @@
+package com.yc.ship.module.resource.api;
+
+import com.yc.ship.framework.common.pojo.CommonResult;
+import com.yc.ship.framework.common.util.object.BeanUtils;
+import com.yc.ship.module.product.api.dto.SupplierRespDTO;
+import com.yc.ship.module.resource.ResourceApi;
+import com.yc.ship.module.resource.api.dto.CheckMachineDTO;
+import com.yc.ship.module.resource.controller.admin.supplier.vo.SupplierRespVO;
+import com.yc.ship.module.resource.service.machine.ScenicMachineService;
+import com.yc.ship.module.resource.service.supplier.ProductSupplierService;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+import static com.yc.ship.framework.common.pojo.CommonResult.success;
+
+/**
+ * @author ：qsl
+ * @description：TODO
+ * @date ：2025/8/12 09:47
+ **/
+@Service
+public class ResourceApiImpl implements ResourceApi {
+
+    @Resource
+    private ProductSupplierService productSupplierService;
+
+    @Resource
+    private ScenicMachineService scenicMachineService;
+
+
+    @Override
+    public CommonResult<SupplierRespDTO> getSupplierById(Long supplierId) {
+        SupplierRespVO supplier = productSupplierService.getSupplierById(supplierId);
+        return success(BeanUtils.toBean(supplier, SupplierRespDTO.class));
+    }
+    @Override
+    public CommonResult<?> getCheckMachineInfo(Integer siteType,String machineId) {
+        Object machineInfo = scenicMachineService.getMachineInfo(siteType,machineId);
+        return success(machineInfo);
+    }
+    @Cacheable(cacheNames = "getCheckMachine#30", key = "#type+'_'+#machineId+'_'+#tenantId")
+    @Override
+    public CommonResult<CheckMachineDTO> getCheckMachine(Integer type, String machineId, Long tenantId) {
+        return success(scenicMachineService.getCheckMachine(machineId, type, tenantId));
+    }
+}

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/driver/DriverController.java

@@ -38,7 +38,7 @@ public class DriverController {
     /**
      * @description: 创建驾驶员时，同时会在系统中创建同名的用户
      * @author yxq
-     * @date: 2024/8/13 16:27
+     * @date: 2025/8/13 16:27
      * @Param createReqVO:
      * @return: com.zshl.system.framework.common.pojo.CommonResult<java.lang.String>
      */
@@ -122,7 +122,7 @@ public class DriverController {
     /**
      * @description: 获取驾驶员的默认车辆列表
      * @author yxq
-     * @date: 2024/8/26 12:15
+     * @date: 2025/8/26 12:15
      * @Param null:
      * @return: null
      */

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/vo/AppCategoryReqVO.java

@@ -33,7 +33,7 @@ public class AppCategoryReqVO {
     @Schema(description = "米", example = "1")
     private Integer rice;
 
-    @Schema(description = "出行日期", example = "2024-06-01")
+    @Schema(description = "出行日期", example = "2025-06-01")
     private Date travelDate;
 
     @Schema(description = "时间方案ID", example = "1")

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/controller/admin/vo/SiteRespDTO.java

@@ -6,7 +6,7 @@ import lombok.Data;
 /**
  * @author ：yaochao
  * @description ：TODO
- * @date ：2024/6/6 16:27
+ * @date ：2025/6/6 16:27
  */
 @Schema(description = "RPC 服务 - Admin 用户 Response DTO")
 @Data

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/dock/ResourceDockDO.java

@@ -13,7 +13,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 /**
  * 资源管理-口岸码头管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_dock")
 @KeySequence("resource_dock_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/port/ResourcePortDO.java

@@ -11,7 +11,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 /**
  * 资源管理-口岸管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_port")
 @KeySequence("resource_port_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/room/ResourceRoomDO.java

@@ -10,7 +10,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 /**
  * 资源管理-游轮房间管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_room")
 @KeySequence("resource_room_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/roommodel/ResourceRoomModelDO.java

@@ -12,7 +12,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 /**
  * 资源管理-房型管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_room_model")
 @KeySequence("resource_room_model_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/roommodelrooms/ResourceRoomModelRoomsDO.java

@@ -9,7 +9,7 @@ import lombok.*;
 /**
  * 资源管理-房型关联房间管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_room_model_rooms")
 @KeySequence("resource_room_model_rooms_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/route/ResourceRouteDO.java

@@ -10,7 +10,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 /**
  * 航线管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_route")
 @KeySequence("resource_route_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/scenic/ResourceScenicDO.java

@@ -11,7 +11,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 /**
  * 景区管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_scenic")
 @KeySequence("resource_scenic_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/dal/dataobject/shiptype/ResourceShipTypeDO.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.*;
 /**
  * 资源管理-游轮类型管理 DO
  *
- * @author flycloud
+ * @author lfy
  */
 @TableName("resource_ship_type")
 @KeySequence("resource_ship_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。