From 5f79ed2ed3b3afd53ae88d01d6d5c3e373868d84 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 3 May 2024 11:06:18 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxRaffleActivityRecord.java | 14 +++++++++++++- .../service/impl/WxRaffleActivityServiceImpl.java | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java index 5966e5c51..f99a4a6f4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRaffleActivityRecord.java @@ -106,7 +106,19 @@ public class WxRaffleActivityRecord extends TenantEntity { @TableField(exist = false) private Map recordItemJiangQuanCountMap; - public String generateItemDetaiJson() { + public String generateItemDetaiJson(Map userMap) { + if(null != auditBy) { + MallUserInfo au = userMap.get(auditBy); + if (null != au) { + this.auditByName = au.getName(); + } + } + if(null != sendBy) { + MallUserInfo su = userMap.get(sendBy); + if (null != su) { + this.sendByName = su.getName(); + } + } if (null != recordItemList && recordItemList.size() > 0 ) { StringBuffer sb = new StringBuffer(); for (int i = 0 ; i < recordItemList.size() ; i++) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index 3fe98577b..2aeff2c09 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -192,7 +192,7 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } } _r.setRecordItemList(getActivityRecordItemListByRecordId(aidList,_r.getId(),_r)); - _r.setItemDetail(_r.generateItemDetaiJson()); + _r.setItemDetail(_r.generateItemDetaiJson(userMap)); if (null != oneActivityExeclList && null != oneAcitvityId) { _r.generateItemIds();