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 goodsList = priceBiz.queryGoodsList(priceConfig.getId());