From 4c14f6a9089519fe3d2cba61cc1ede97855bb185 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 17:45:13 +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

---
 .../impl/TbPointsExchangeRecordServiceImpl.java       | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

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 6ef1c88..2e04bda 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
@@ -217,14 +217,8 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
         if (entity == null) {
             throw new MsgException("订单不存在");
         }
-        TbPointsBasicSetting basic = null;
-        TbPointsGoodsSetting goods = null;
-        TbMemberPoints memberPoints = null;
         try {
-            Object[] verify = verify(entity);
-            basic = (TbPointsBasicSetting) verify[0];
-            goods = (TbPointsGoodsSetting) verify[1];
-            memberPoints = (TbMemberPoints) verify[2];
+            verify(entity);
         } catch (Exception e) {
             throw new MsgException(e.getMessage().concat("，请您取消订单"));
         }
@@ -248,11 +242,12 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
             throw new MsgException("此商品不需要额外支付金额");
         }
         // 如果不需要额外支付
-        if (NumberUtil.equals(record.getExtraPaymentAmount(), BigDecimal.ZERO)) {
+        if (NumberUtil.equals(entity.getExtraPaymentAmount(), BigDecimal.ZERO)) {
             // 设置核销券码
             entity.setCouponCode(IdUtil.getSnowflakeNextIdStr());
             entity.setStatus("waiting");
             entity.setPayTime(new Date());
+            entity.setPayType(record.getPayType().toUpperCase());
             super.updateById(entity);
             waitingAfter(entity);
             return entity;