修改参数类型

cash-common/cash-common-service/src/main/java/com/czg/market/dto/PpPackageOrderDTO.java

@@ -1,15 +1,18 @@
 
 package com.czg.market.dto;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import com.alibaba.fastjson2.annotation.JSONField;
-import lombok.experimental.Accessors;
-import java.io.Serial;
+import com.czg.market.vo.PpPackageVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 套餐推广订单 实体类。
@@ -63,6 +66,7 @@ public class PpPackageOrderDTO implements Serializable {
 
     /**
      * 订单状态：ing进行中, wait_verify 待核销，finish 已核销，refunding 退款中，refund 已退款，cancel 已取消，timeout 超时
+     * {@link com.czg.constants.PpPackageConstants.OrderStatus}
      */
     private String status;
 
@@ -111,4 +115,30 @@ public class PpPackageOrderDTO implements Serializable {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    /**
+     * 过期时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime expireTime;
+
+    /**
+     * 是否可以助力：0: 不可以 1: 可以
+     */
+    private Integer canHelp;
+
+    /**
+     * 是否是自己订单 0: 不是 1: 是
+     */
+    private Integer isMyself;
+
+    /**
+     * 阶梯优惠
+     */
+    private List<PpPackageVO.TieredDiscount> tieredDiscount;
+
+    /**
+     * 分享期限（小时）
+     */
+    private Integer expireHours;
+
 }

cash-common/cash-common-service/src/main/java/com/czg/market/entity/PpHelpRecord.java

@@ -11,6 +11,7 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 /**
  * 套餐推广助力记录 实体类。
@@ -20,6 +21,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @Builder
+@Accessors(chain = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @Table("pp_help_record")

cash-common/cash-common-service/src/main/java/com/czg/market/entity/PpPackageOrder.java

@@ -1,5 +1,6 @@
 package com.czg.market.entity;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -117,4 +118,10 @@ public class PpPackageOrder implements Serializable {
     @Column(onInsertValue = "now()", onUpdateValue = "now()")
     private LocalDateTime updateTime;
 
+    /**
+     * 过期时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime expireTime;
+
 }

cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java

@@ -11,4 +11,7 @@ import com.czg.market.entity.PpHelpRecord;
  */
 public interface PpHelpRecordService extends IService<PpHelpRecord> {
 
+    boolean canHelp(Long userId, Long orderId);
+
+    boolean help(Long userId, Long orderId);
 }

cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java

@@ -1,5 +1,6 @@
 package com.czg.market.service;
 
+import com.czg.market.dto.PpPackageOrderDTO;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.PpPackageOrder;
 
@@ -16,6 +17,16 @@ public interface PpPackageOrderService extends IService<PpPackageOrder> {
      */
     Long createPackageOrder(Long packageId);
 
+    /**
+     * 根据订单 Id 查询推广订单详情
+     */
+    PpPackageOrderDTO getOrderDetailById(Long orderId);
+
+    /**
+     * 助力订单
+     */
+    boolean helpOrder(Long orderId);
+
     /**
      * 获取进行中的套餐推广订单数量
      */

cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java

@@ -3,6 +3,8 @@ package com.czg.market.vo;
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.czg.validator.group.InsertGroup;
 import com.czg.validator.group.UpdateGroup;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -150,6 +152,8 @@ public class PpPackageVO {
     /**
      * 分享期限（小时）
      */
+    @Max(value = 72, message = "分享期限不能大于72小时", groups = {UpdateGroup.class, InsertGroup.class})
+    @Min(value = 1, message = "分享期限不能小于1小时", groups = {UpdateGroup.class, InsertGroup.class})
     private Integer expireHours;
 
     /**
@@ -160,7 +164,7 @@ public class PpPackageVO {
     /**
      * 商品详情图片
      */
-    private String detailImages;
+    private List<String> detailImages;
 
     /**
      * 创建时间