diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java index e394e75a8..ff14b10bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java @@ -280,7 +280,7 @@ public class WxRaffleActivityController extends BaseController { List aids = new ArrayList();; aids.add(activity.getActivityId()); activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo)); - activity.setItemDetail(activity.generateItemDetaiJson()); + activity.setItemDetail(activity.generateItemDetaiJson(wxCashBackActivityService.getMallUserInfoMap(activity))); if (null != activity.getMerchantId()) { WxMerchant m = new WxMerchant(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java index 030166571..fdb759fdb 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxRaffleActivityController.java @@ -135,7 +135,7 @@ public class WxRaffleActivityController extends BaseController { List aids = new ArrayList();; aids.add(activity.getActivityId()); activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo)); - activity.setItemDetail(activity.generateItemDetaiJson()); + activity.setItemDetail(activity.generateItemDetaiJson(wxCashBackActivityService.getMallUserInfoMap(activity))); if (null != activity.getMerchantId()) { WxMerchant m = new WxMerchant(); m.updateTenantInfo(activity); diff --git a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java index 87f68f555..532930b4a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java @@ -82,5 +82,7 @@ public interface WxRaffleActivityService { void saveOrUpdateRecord(WxRaffleActivityRecord record); + Map getMallUserInfoMap(TenantEntity tenantEntity); + } 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 2aeff2c09..cc6986b9e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -216,7 +216,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { return itemMap; } - private Map getMallUserInfoMap(TenantEntity tenantEntity) { + @Override + public Map getMallUserInfoMap(TenantEntity tenantEntity) { MallUserInfo mui = new MallUserInfo(); mui.updateTenantInfo(tenantEntity); return mallUserInfoService.getUserMap(mui);