Merge branch 'dev/2024/0604/update-admin-Y' of feifan/mall-backend-admin into master

返回订单中的支付所用积分

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java

@@ -73,5 +73,28 @@ public class TradeOrderPageReqVO extends PageParam {
 
     @Schema(description = "店铺编号集")
     private List<Long> shopIds;
+    @Schema(description = "支付积分")
+    private Long payIntegral;
+
+    @Schema(description = "用户获得积分")
+    private Long increaseIntegral;
+
+    @Schema(description = "退还的使用的积分")
+    private Long refundIntegral;
+
+    @Schema(description = "实付人民币，单位：分")
+    private Integer payRmb;
+
+    @Schema(description = "订阅物流信息，未订阅是0，已订阅是1", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer subscriptionLogisticsInfo;
+
+    @Schema(description = "物流签收时间")
+    private LocalDateTime receivingTime;
+
+    @Schema(description = "发货备注", example = "你猜")
+    private String deliveryRemark;
+
+    @Schema(description = "发货信息附件")
+    private String attachment;
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderDetailRespVO.java

@@ -1,12 +1,10 @@
 package cn.newfeifan.mall.module.trade.controller.app.order.vo;
 
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
-import cn.newfeifan.mall.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 @Schema(description = "用户 App - 订单交易的明细 Response VO")
@@ -146,4 +144,7 @@ public class AppTradeOrderDetailRespVO {
 
     @Schema(description = "店铺id", example = "20588")
     private Long shopId;
+
+    @Schema(description = "支付积分", example = "10000")
+    private Long payIntegral;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -334,6 +334,22 @@ public class TradeOrderDO extends BaseDO {
     private Long shopId;
 
     private Long merchantId;
+    /**
+     * 支付积分
+     */
+    private Long payIntegral;
+    /**
+     * 用户获得积分
+     */
+    private Long increaseIntegral;
+    /**
+     * 退还的使用的积分
+     */
+    private Long refundIntegral;
+    /**
+     * 实付人民币，单位：分
+     */
+    private Integer payRmb;
 
     /**
      * 订阅物流信息，未订阅是0，已订阅是1