From 7f77a3187df5968b8ab7b4a9fd3c5d8b67690412 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Mon, 17 Mar 2025 16:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=950=E5=85=83=E6=97=B6=20?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BD=BF=E7=94=A8=20=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E4=BD=BF=E7=94=A8=20=E4=BC=9A=E5=91=98=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E4=B8=8D=E8=B5=A0=E9=80=81=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderInfoServiceImpl.java    |  7 ++++--
 .../order/service/impl/PayServiceImpl.java    | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index 58567015..acfd857f 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -716,8 +716,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 }
             }
         }
-        //下单赠送积分
-        pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo);
+        if (!payType.equals(PayEnums.VIP_PAY)) {
+            //下单赠送积分
+            pointsService.consumeAwardPoints(orderInfo.getUserId(), orderInfo);
+        }
 
         orderDetailService.updateChain().set(OrderDetail::getStatus, OrderStatusEnums.DONE.getCode()).eq(OrderDetail::getOrderId, orderInfo.getId()).update();
 //        if (!"after-pay".equals(orderInfo.getPayMode())) {
@@ -848,6 +850,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setStatus(OrderStatusEnums.DONE.getCode());
             orderInfo.setPayType(PayEnums.CASH_PAY.getValue());
             orderInfo.setPaidTime(LocalDateTime.now());
+
         }
         saveOrUpdate(orderInfo);
     }
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index c21a7490..608d837a 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.exceptions.ValidateException;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
 import com.czg.account.entity.*;
@@ -104,8 +105,31 @@ public class PayServiceImpl implements PayService {
     private OrderInfo checkPay(CheckOrderPay checkOrderPay) {
         OrderInfo orderInfo = orderInfoService.checkOrderPay(checkOrderPay);
         if (orderInfo.getOrderAmount().compareTo(BigDecimal.ZERO) == 0) {
+            //积分使用
+            if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
+                pointsService.deductPoints(orderInfo.getUserId(), orderInfo.getPointsNum(), "积分抵扣账单", orderInfo);
+            }
+            //更新优惠券信息
+            if (StrUtil.isNotBlank(orderInfo.getCouponInfoList()) && !"null".equals(orderInfo.getCouponInfoList())) {
+                //券消耗
+                List<Long> coupons = JSON.parseArray(orderInfo.getCouponInfoList(), Long.class);
+                if (CollUtil.isNotEmpty(coupons)) {
+                    if (orderInfo.getUserId() == null) {
+                        log.info("订单：{}优惠券使用失败，用户Id为空", orderInfo.getId());
+                    } else {
+                        ShopUser shopUser = shopUserService.getShopUserInfo(orderInfo.getShopId(), orderInfo.getUserId());
+                        if (shopUser == null) {
+                            log.info("订单：{}优惠券使用失败，店铺用户不存在", orderInfo.getId());
+                        } else {
+                            couponService.use(coupons, shopUser.getId(), orderInfo.getId());
+                        }
+                    }
+                }
+            }
+            orderDetailService.updateChain().set(OrderDetail::getStatus, OrderStatusEnums.DONE.getCode()).eq(OrderDetail::getOrderId, orderInfo.getId()).update();
             //发送打票信息
             rabbitPublisher.sendOrderPrintMsg(orderInfo.getId().toString(), true);
+            redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
             throw new PaySuccessException();
         }
         return orderInfo;