From 02a756d32df35045335e18cc5c2296e34eeb962c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= <tankaikai@aliyun.com>
Date: Fri, 1 Nov 2024 16:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E5=9D=97=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/entity/TbPointsExchangeRecord.java     | 1 +
 .../service/impl/TbPointsExchangeRecordServiceImpl.java   | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPointsExchangeRecord.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPointsExchangeRecord.java
index 260baac..6418174 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPointsExchangeRecord.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPointsExchangeRecord.java
@@ -106,6 +106,7 @@ public class TbPointsExchangeRecord {
     /**
      * 取消/退款时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date cancelOrRefundTime;
     /**
      * 实际支付时间
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
index f70c18b..c18280f 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
@@ -224,7 +224,7 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
         } catch (Exception e) {
             throw new MsgException(e.getMessage().concat("，请您取消订单"));
         }
-        if (!"unpaid".equals(record.getStatus())) {
+        if (!"unpaid".equals(entity.getStatus())) {
             throw new MsgException("订单状态异常，请刷新后重试");
         }
         if (StrUtil.isBlank(record.getPayType())) {
@@ -446,12 +446,6 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
         if (NumberUtil.equals(entity.getExtraPaymentAmount(), BigDecimal.ZERO)) {
             return;
         }
-        if (StrUtil.isBlank(record.getOpenId())) {
-            throw new MsgException("openId/userId不能为空");
-        }
-        if (StrUtil.isBlank(record.getIp())) {
-            throw new MsgException("无法获取用户ip地址");
-        }
         // 需要额外支付
         TbShopInfo shopInfo = mpShopInfoMapper.selectById(entity.getShopId());
         if (shopInfo == null) {