From 8b7e349d1c06f606b1b9eaeacd763df55caad3b7 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Mon, 28 Jul 2025 13:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ycwl/basic/service/pc/impl/OrderServiceImpl.java   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
index 537b973..3aa549e 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.ycwl.basic.service.pc.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.ycwl.basic.utils.JacksonUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -472,6 +473,14 @@ public class OrderServiceImpl implements OrderService {
         // 看看有没有之前购买的订单
         OrderEntity order = orderMapper.getUserOrderItem(userId, createOrderReqVO.getScenicId(), 0, null, createOrderReqVO.getGoodsType(), createOrderReqVO.getGoodsId());
         boolean haveOldOrder = order != null;
+        if (order != null) {
+            if (order.getStatus() != OrderStateEnum.PAID.getState() && order.getStatus() != OrderStateEnum.UNPAID.getState()) {
+                haveOldOrder = false;
+            }
+            if (!DateUtil.isSameDay(order.getCreateAt(), new Date())) {
+                haveOldOrder = false;
+            }
+        }
         if (!haveOldOrder) {
             order = new OrderEntity();
             order.setId(SnowFlakeUtil.getLongId());
@@ -574,6 +583,7 @@ public class OrderServiceImpl implements OrderService {
         order.setMemberId(userId);
         MemberRespVO member = memberMapper.getById(userId);
         order.setOpenId(member.getOpenId());
+        order.setPriceConfigId(priceConfig.getId());
         order.setScenicId(priceConfig.getScenicId());
         order.setType(priceConfig.getType());
         List<GoodsListRespVO> goodsList = priceBiz.queryGoodsList(priceConfig.getId());