From 4344704dd93f1a707f6eb524eeabb68bb9a81bf8 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 11 Dec 2025 09:31:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A3=80=E6=9F=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkPointsGoodsRecordServiceImpl.java | 2 +-
 .../market/service/impl/MkPointsGoodsServiceImpl.java       | 6 +++---
 .../order/service/impl/PointsGoodPayServiceImpl.java        | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java
index 9a59e5f7a..01c042a06 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsRecordServiceImpl.java
@@ -74,7 +74,7 @@ public class MkPointsGoodsRecordServiceImpl extends ServiceImpl<MkPointsGoodsRec
         if (record == null) {
             throw new CzgException("未找到该兑换码");
         }
-        if (!record.getStatus().equals("待核销") && !record.getStatus().equals("退款中")) {
+        if (!"待核销".equals(record.getStatus()) && !"退款中".equals(record.getStatus())) {
             throw new CzgException("核销失败，该商品不可核销");
         }
         MkPointsGoodsRecord upRecord = new MkPointsGoodsRecord();
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
index b5c6ae02b..7a15304f5 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
@@ -50,7 +50,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
                         .orderBy(MkPointsGoods::getId, false)
         );
         page.getRecords().forEach(goods -> {
-            if (goods.getGoodsCategory().equals("优惠券")) {
+            if ("优惠券".equals(goods.getGoodsCategory())) {
                 ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
                         .eq(ShopCoupon::getShopId, shopId)
                         .eq(ShopCoupon::getStatus, 1)
@@ -68,7 +68,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
         PageHelper.startPage(page, size);
         List<MkPointsGoods> list = mapper.getPointsGoodsPageByUser(shopId, userId, StrUtil.trim(goodsCategory));
         list.forEach(goods -> {
-            if (goods.getGoodsCategory().equals("优惠券")) {
+            if ("优惠券".equals(goods.getGoodsCategory())) {
                 ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId())
                         .eq(ShopCoupon::getShopId, shopId)
                         .eq(ShopCoupon::getStatus, 1)
@@ -110,7 +110,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
         if (record1 == null) {
             throw new CzgException("取消失败，订单不存在");
         }
-        if (!record1.getStatus().equals("退款中")) {
+        if (!"退款中".equals(record1.getStatus())) {
             throw new CzgException("取消失败，订单不处于退款中");
         }
         MkPointsGoodsRecord record = new MkPointsGoodsRecord();
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java
index c105ecf0b..ec054dae6 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PointsGoodPayServiceImpl.java
@@ -31,6 +31,9 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.Map;
 
+/**
+ * @author ww
+ */
 @Slf4j
 @Service
 public class PointsGoodPayServiceImpl implements PointsGoodPayService {
@@ -146,7 +149,7 @@ public class PointsGoodPayServiceImpl implements PointsGoodPayService {
             goods = goodsService.getById(record.getPointsGoodsId());
         }
         record.setIsDel(0);
-        if (goods.getGoodsCategory().equals("优惠券")) {
+        if ("优惠券".equals(goods.getGoodsCategory())) {
             record.setStatus("已完成");
             record.setCheckoutTime(LocalDateTime.now());
             goodsRecordService.save(record);