From 69283b5a4559509187516355602e32e4bdac9d5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 二月 2025 11:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
index f09b5a2..a235b29 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/TransactionsServiceImpl.java
@@ -192,13 +192,13 @@
//璐拱濂楅 澶勭悊鍐呭
DiscountMember discountMember = discountMemberMapper.selectById(transactions.getObjId());
if(Objects.nonNull(discountMember)){
- transactions.setContent(discountMember.getName() +" 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
+ transactions.setContent(discountMember.getName() +" | 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +" 鑷� "+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
}
}else if(Constants.equalsInteger(transactions.getType(),Constants.TRANSACTIONS_TYPE.PLATFORM_REFUND.getKey())){
DiscountMember discountMember = discountMemberMapper.selectOne(
new QueryWrapper<DiscountMember>().lambda().eq(DiscountMember::getGoodsorderId, transactions.getOrderId()).last("limit 1"));
if(Objects.nonNull(discountMember)){
- transactions.setContent(discountMember.getName() +" 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +"-"+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
+ transactions.setContent(discountMember.getName() +" | 鏈夋晥鏈�" + DateUtil.dateToString(discountMember.getUseStartDate(),"yyyy-MM-dd") +" 鑷� "+DateUtil.dateToString(discountMember.getUseEndDate(),"yyyy-MM-dd"));
}
}
}
--
Gitblit v1.9.3