From 9c3f4db39a9e45b0a4ada5eda3a2781a3e5a3235 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 22 Oct 2025 10:48:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E6=8A=98=E6=89=A3=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/order/dto/OrderInfoDTO.java  |  5 +++++
 .../src/main/java/com/czg/order/entity/OrderInfo.java  | 10 ++++++++++
 .../order/service/impl/OrderInfoServiceImpl.java       |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java
index 33f3e6113..c6dcf5c0a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java
@@ -170,6 +170,11 @@ public class OrderInfoDTO implements Serializable {
      */
     private String discountInfo;
 
+    /**
+     * 限时折扣信息 json
+     */
+    private String limitRate;
+
     /**
      * 是否支持退款，1支持退单， 0不支持退单
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
index 782feec5d..8735d2f89 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
@@ -1,6 +1,7 @@
 package com.czg.order.entity;
 
 import cn.hutool.core.util.StrUtil;
+import com.czg.order.dto.LimitRateDTO;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
@@ -189,6 +190,15 @@ public class OrderInfo implements Serializable {
      * 折扣信息 json
      */
     private String discountInfo;
+    /**
+     * 限时折扣信息 json
+     */
+    private String limitRateJson;
+    /**
+     * 限时折扣信息 json
+     */
+    @Column(ignore = true)
+    private LimitRateDTO limitRate;
 
     /**
      * 是否支持退款，1支持退单， 0不支持退单
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 46faa976e..1f75dc1ea 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -7,6 +7,7 @@ import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.*;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
@@ -240,6 +241,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if (historyOrderVo == null || historyOrderVo.getId() == null) {
             return null;
         }
+        if (StrUtil.isNotBlank(historyOrderVo.getLimitRateJson())) {
+            historyOrderVo.setLimitRate(JSONUtil.toBean(historyOrderVo.getLimitRateJson(), LimitRateDTO.class));
+        }
         List<OrderDetail> orderDetails = orderDetailService.queryChain().select()
                 .eq(OrderDetail::getOrderId, historyOrderVo.getId())
                 .list();
@@ -1276,6 +1280,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setIsWaitCall(param.isWaitCall() ? 1 : 0);
             orderInfo.setCreditBuyerId(param.getCreditBuyerId());
             orderInfo.setIsDel(0);
+            if (param.getLimitRate() != null) {
+                orderInfo.setLimitRateJson(JSONObject.toJSONString(param.getLimitRate()));
+            }
             //取餐码 多端一致
             orderInfo.setTakeCode(getCode(shopInfo.getId()));
         }