From ed293f8128756bc73d5288a9561ce01a716bfc38 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 3 Dec 2025 13:44:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E8=81=8A=E5=88=B8=20=E7=9A=84=20?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/czg/market/entity/MkShopCouponRecord.java    | 3 +++
 .../market/service/impl/MkShopCouponRecordServiceImpl.java     | 3 +--
 .../service/order/service/impl/OrderInfoCustomServiceImpl.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java
index e8ad2a711..a23b2783d 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkShopCouponRecord.java
@@ -122,6 +122,9 @@ public class MkShopCouponRecord implements Serializable {
     private LocalDateTime useEndTime;
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime useStartTime;
+
+    @Column(ignore = true)
+    private String couponName;
     /**
      * 有效期类型：fixed（固定时间），custom（自定义时间）
      */
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 e8f2cad37..a7dec33ba 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
@@ -519,11 +519,10 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
     public MkShopCouponRecord assembleRecord(Long chatCouponId, ShopCoupon coupon) {
         MkShopCouponRecord record = new MkShopCouponRecord();
         record.setShopId(coupon.getShopId());
-
+        record.setCouponName(coupon.getTitle());
         record.setCouponId(coupon.getId());
         record.setCouponSyncId(coupon.getSyncId());
         record.setSourceId(chatCouponId);
-
         record.setSource("群聊发放");
         record.setStatus(0);
         record.setType(coupon.getCouponType());
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
index 3a91b5d45..cdfa32cb0 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -502,7 +502,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
             } else {
                 BigDecimal discount = BigDecimal.valueOf(100).subtract(BigDecimal.valueOf(shopUser.getDiscount())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
                 BigDecimal discountAmount = newTotalAmount.multiply(discount);
-                discountAmount = discountAmount.setScale(2, RoundingMode.HALF_DOWN);
+                discountAmount = discountAmount.setScale(2, RoundingMode.HALF_UP);
                 if (discountAmount.compareTo(param.getVipDiscountAmount()) != 0) {
                     log.info("会员整单折扣金额不正确：传递为：{}，计算为：{}", param.getVipDiscountAmount(), discountAmount);
                     throw new OrderValidateException("生成支付订单失败，会员整单折扣金额不正确");