From 95d2c0d80935655305c9c5deda18d2875b1d3e6b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 18 Sep 2025 16:55:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/czg/order/dto/CheckOrderPay.java |  2 +-
 .../impl/MkShopCouponRecordServiceImpl.java   |  2 +-
 cash-service/order-service/pom.xml            |  5 ++++
 .../service/impl/OrderInfoServiceImpl.java    | 23 +++++++++++++------
 .../order/service/impl/PayServiceImpl.java    | 21 ++++++++---------
 5 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
index 950d243f..e32f7ae7 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/CheckOrderPay.java
@@ -59,7 +59,7 @@ public class CheckOrderPay implements Serializable {
     /**
      * 新客立减
      */
-    private BigDecimal newCustomerDiscountId;
+    private Long newCustomerDiscountId;
     private BigDecimal newCustomerDiscountAmount;
 
     /**
diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
index bc3cf8a2..3a37820f 100644
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
@@ -203,7 +203,7 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
     }
 
     @Override
-    public Boolean grant(Long shopId, MkRewardCouponDTO     rewardCouponDTO) {
+    public Boolean grant(Long shopId, MkRewardCouponDTO rewardCouponDTO) {
         ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, rewardCouponDTO.getUserId()));
         MkShopCouponGiftDTO giftDTO = new MkShopCouponGiftDTO().setCouponId(rewardCouponDTO.getCouponId())
                 .setShopId(shopId)
diff --git a/cash-service/order-service/pom.xml b/cash-service/order-service/pom.xml
index 15775dc5..c437c8ac 100644
--- a/cash-service/order-service/pom.xml
+++ b/cash-service/order-service/pom.xml
@@ -23,6 +23,11 @@
             <artifactId>pay-service</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.czg</groupId>
+            <artifactId>market-service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.czg</groupId>
             <artifactId>cash-common-mq</artifactId>
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 320249b1..cb9d81c3 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
@@ -106,15 +106,17 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     private ShopTableService shopTableService;
     @DubboReference
     private PointsBasicSettingService pointsBasicService;
-    @DubboReference
+    @Resource
     private MkShopConsumerCouponService consumerCouponService;
-    @DubboReference
+    @Resource
     private ShopCouponService couponService;
-    @DubboReference
+    @Resource
     private MkShopCouponRecordService couponRecordService;
-    @DubboReference
+    @Resource
     private TbMemberConfigService memberConfigService;
     @Resource
+    private MkShopConsumeDiscountRecordService newConsumerDiscountRecordService;
+    @Resource
     private MemberOrderService memberOrderService;
     // 延迟 5 秒
     private static final long DELAY = 5;
@@ -460,9 +462,12 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     fullReductionAmount.getPrice(), rateAmount.getPrice(), oneGiftAmount.getPrice(), twoHalfAmount.getPrice(), param.getOtherCouponDiscountAmount());
             throw new ValidateException("生成支付订单失败，商品优惠券优惠金额不正确");
         }
-        //TODO 新客立减
         //新客立减
-        newTotalAmount = newTotalAmount.subtract(param.getNewCustomerDiscountAmount());
+        if (shopUser != null) {
+            newTotalAmount = newTotalAmount.subtract(param.getNewCustomerDiscountAmount());
+        } else {
+            param.setNewCustomerDiscountAmount(BigDecimal.ZERO);
+        }
         //折扣金额
         if (param.getDiscountAmount().compareTo(BigDecimal.ZERO) > 0) {
             newTotalAmount = totalAmount.getPrice().subtract(param.getDiscountAmount());
@@ -866,7 +871,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                                 .set(OrderInfo::getPayAmount, 0)
                                 .update();
                     } else {
-//                        //会员活动
+                        //TODO 以前的会员活动
 //                        activateService.giveActivate(shopUser, new BigDecimal(czgCallBackDto.getAmount()).divide(new BigDecimal(100), 2, RoundingMode.DOWN),
 //                                payment.getRelatedId(), flowId);
                     }
@@ -1146,6 +1151,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                         log.error("订单积分使用或优惠券扣除失败，订单id：{}", orderInfo.getId());
                     }
                 } else {
+                    //TODO 新客立减
+                    if (param.getNewCustomerDiscountId() != null) {
+                        newConsumerDiscountRecordService.useDiscount(param.getNewCustomerDiscountId(), shopUser.getId(), param.getOrderId(), param.getNewCustomerDiscountAmount());
+                    }
                     //积分使用
                     if (orderInfo.getPointsNum() != null && orderInfo.getPointsNum() > 0) {
                         pointsService.deductPoints(shopUser.getId(), orderInfo.getPointsNum(), "积分抵扣账单", 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 7720e3e4..9b7a4afb 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
@@ -17,7 +17,9 @@ import com.czg.entity.resp.*;
 import com.czg.enums.ShopUserFlowBizEnum;
 import com.czg.exception.CzgException;
 import com.czg.exception.PaySuccessException;
+import com.czg.market.entity.MkShopCouponRecord;
 import com.czg.market.service.MemberOrderService;
+import com.czg.market.service.MkShopCouponRecordService;
 import com.czg.order.dto.BigDecimalDTO;
 import com.czg.order.dto.CheckOrderPay;
 import com.czg.order.dto.OrderInfoRefundDTO;
@@ -75,12 +77,10 @@ public class PayServiceImpl implements PayService {
     private UserInfoService userInfoService;
     @DubboReference
     private ShopInfoService shopInfoService;
-    //    @DubboReference
-//    private ShopActivateService shopActivateService;
     @DubboReference
     private ShopUserFlowService userFlowService;
-    //    @DubboReference
-//    private ShopCouponService couponService;
+    @Resource
+    private MkShopCouponRecordService recordService;
     @DubboReference
     private MemberPointsService pointsService;
     @DubboReference
@@ -371,8 +371,8 @@ public class PayServiceImpl implements PayService {
                 .setBizEnum(ShopUserFlowBizEnum.CASH_IN);
         //更新会员余额 并生成流水
         Long flowId = shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
-        //会员活动
-//        shopActivateService.giveActivate(shopUser, payParam.getAmount(), payParam.getActivateId(), flowId);
+        //TODO 以前的会员活动
+        //shopActivateService.giveActivate(shopUser, payParam.getAmount(), payParam.getActivateId(), flowId);
         return CzgResult.success();
     }
 
@@ -550,12 +550,11 @@ public class PayServiceImpl implements PayService {
             shopUserService.updateMoney(shopUser.getShopId(), giftFlowEdit);
             userFlowService.updateRefund(giftFlow.getId(), giftFlow.getAmount());
         }
-        //TODO 移除优惠券
         //移除优惠券
-//        inRecordService.remove(QueryWrapper.create()
-//                .eq(ShopActivateCouponRecord::getSourceFlowId, inFlow.getId())
-//                .eq(ShopActivateCouponRecord::getSource, "activate")
-//                .eq(ShopActivateCouponRecord::getStatus, 0));
+        recordService.remove(QueryWrapper.create()
+                .eq(MkShopCouponRecord::getSourceFlowId, inFlow.getId())
+                .eq(MkShopCouponRecord::getSource, "activate")
+                .eq(MkShopCouponRecord::getStatus, 0));
         return CzgResult.success();
     }