参数序列化问题

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

@@ -132,13 +132,18 @@ public class PpPackageOrderDTO implements Serializable {
     private Integer isMyself;
 
     /**
-     * 阶梯优惠
+     * 套餐信息
      */
-    private List<PpPackageVO.TieredDiscount> tieredDiscount;
+    private PpPackageVO packageInfo;
 
     /**
-     * 分享期限（小时）
+     * 店铺名称
      */
-    private Integer expireHours;
+    private String shopName;
+
+    /**
+     * 店铺地址
+     */
+    private String shopAddress;
 
 }

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

@@ -1,5 +1,6 @@
 package com.czg.market.entity;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -66,6 +67,7 @@ public class PpPackage implements Serializable {
     /**
      * 套餐图片
      */
+    @JsonIgnore
     private String images;
 
     /**
@@ -81,6 +83,7 @@ public class PpPackage implements Serializable {
     /**
      * 套餐内容 json
      */
+    @JsonIgnore
     private String packageContent;
 
     /**
@@ -101,6 +104,7 @@ public class PpPackage implements Serializable {
     /**
      * 阶梯优惠
      */
+    @JsonIgnore
     private String tieredDiscount;
 
     /**
@@ -116,6 +120,7 @@ public class PpPackage implements Serializable {
     /**
      * 商品详情图片
      */
+    @JsonIgnore
     private String detailImages;
 
     /**

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

@@ -1,6 +1,9 @@
 package com.czg.market.service;
 
 import com.czg.market.dto.PpPackageOrderDTO;
+import com.czg.market.vo.PpOrderListVO;
+import com.czg.order.dto.GbOrderQueryParam;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.PpPackageOrder;
 
@@ -28,12 +31,12 @@ public interface PpPackageOrderService extends IService<PpPackageOrder> {
     boolean helpOrder(Long orderId);
 
     /**
-     * 获取进行中的套餐推广订单数量
+     * 查询订单分页
      */
-    long getProgressingPackageOrderCount(Long packageId);
+    Page<PpOrderListVO> queryOrderList(Long shopId, Long userId, GbOrderQueryParam param);
 
     /**
-     * 将所有正在进行的推广订单设置为取消
+     * 取消订单
      */
-    void cancelProgressingPackageOrder(Long shopId, Long packageId);
+    Boolean cancelOrder(Long orderId);
 }

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

@@ -48,4 +48,8 @@ public interface PpPackageService extends IService<PpPackage> {
      * 获取套餐分页
      */
     Page<PpPackageVO> getPackagePage(PpPackagePageReqVo reqVo, boolean isAdmin);
+
+    PpPackage getPackageById(Long id);
+
+    PpPackageVO convertPackageToVo(PpPackage ppPackage);
 }

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

@@ -0,0 +1,98 @@
+package com.czg.market.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author yjjie
+ * @date 2025/12/18 16:36
+ */
+@Data
+public class PpOrderListVO {
+
+    /**
+     * 自增主键
+     */
+    private Long id;
+
+    /**
+     * 店铺 Id
+     */
+    private Long shopId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 套餐 Id
+     */
+    private Long packageId;
+
+    /**
+     * 分享人数
+     */
+    private Integer shareNum;
+
+    /**
+     * 订单状态：ing进行中, wait_verify 待核销，finish 已核销，refunding 退款中，refund 已退款，cancel 已取消，timeout 超时
+     * {@link com.czg.constants.PpPackageConstants.OrderStatus}
+     */
+    private String status;
+
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+
+    /**
+     * 店铺地址
+     */
+    private String shopAddress;
+
+    /**
+     * 套餐名称
+     */
+    private String packageName;
+
+    /**
+     * 套餐原价
+     */
+    private BigDecimal originPrice;
+
+    /**
+     * 销售价格
+     */
+    private BigDecimal price;
+
+    /**
+     * 套餐图片
+     */
+    @JsonIgnore
+    private String imagesStr;
+
+    /**
+     * 套餐图片Json
+     */
+    private List<String> images;
+
+    /**
+     * 阶梯优惠
+     */
+    @JsonIgnore
+    private String tieredDiscountStr;
+
+    /**
+     * 阶梯优惠Json
+     */
+    private List<PpPackageVO.TieredDiscount> tieredDiscount;
+
+    /**
+     * 分享期限（小时）
+     */
+    private Integer expireHours;
+}

cash-common/cash-common-service/src/main/java/com/czg/order/dto/GbOrderQueryParam.java

@@ -23,10 +23,12 @@ public class GbOrderQueryParam extends BaseQueryParam {
 
     /**
      * 下单 开始时间 yyyy-MM-dd HH:mm:ss
+     * 支付 开始时间 yyyy-MM-dd HH:mm:ss
      */
     private String orderStartTime;
     /**
      * 下单 结束时间 yyyy-MM-dd HH:mm:ss
+     * 支付 结束时间 yyyy-MM-dd HH:mm:ss
      */
     private String orderEndTime;
 
@@ -53,6 +55,11 @@ public class GbOrderQueryParam extends BaseQueryParam {
      */
     private String groupOrderNo;
 
+    /**
+     * 名称
+     */
+    private String name;
+
 
 
     public String getOrderStartTime() {