| @@ -280,7 +280,7 @@ public class WxRaffleActivityController extends BaseController { | |||||
| List<Long> aids = new ArrayList<Long>();; | List<Long> aids = new ArrayList<Long>();; | ||||
| aids.add(activity.getActivityId()); | aids.add(activity.getActivityId()); | ||||
| activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo)); | activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo)); | ||||
| activity.setItemDetail(activity.generateItemDetaiJson()); | |||||
| activity.setItemDetail(activity.generateItemDetaiJson(wxCashBackActivityService.getMallUserInfoMap(activity))); | |||||
| if (null != activity.getMerchantId()) { | if (null != activity.getMerchantId()) { | ||||
| WxMerchant m = new WxMerchant(); | WxMerchant m = new WxMerchant(); | ||||
| @@ -135,7 +135,7 @@ public class WxRaffleActivityController extends BaseController { | |||||
| List<Long> aids = new ArrayList<Long>();; | List<Long> aids = new ArrayList<Long>();; | ||||
| aids.add(activity.getActivityId()); | aids.add(activity.getActivityId()); | ||||
| activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo)); | activity.setRecordItemList(wxCashBackActivityService.getActivityRecordItemListByRecordId(aids, id, tenantInfo)); | ||||
| activity.setItemDetail(activity.generateItemDetaiJson()); | |||||
| activity.setItemDetail(activity.generateItemDetaiJson(wxCashBackActivityService.getMallUserInfoMap(activity))); | |||||
| if (null != activity.getMerchantId()) { | if (null != activity.getMerchantId()) { | ||||
| WxMerchant m = new WxMerchant(); | WxMerchant m = new WxMerchant(); | ||||
| m.updateTenantInfo(activity); | m.updateTenantInfo(activity); | ||||
| @@ -82,5 +82,7 @@ public interface WxRaffleActivityService { | |||||
| void saveOrUpdateRecord(WxRaffleActivityRecord record); | void saveOrUpdateRecord(WxRaffleActivityRecord record); | ||||
| Map<Long,MallUserInfo> getMallUserInfoMap(TenantEntity tenantEntity); | |||||
| } | } | ||||
| @@ -216,7 +216,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { | |||||
| return itemMap; | return itemMap; | ||||
| } | } | ||||
| private Map<Long,MallUserInfo> getMallUserInfoMap(TenantEntity tenantEntity) { | |||||
| @Override | |||||
| public Map<Long,MallUserInfo> getMallUserInfoMap(TenantEntity tenantEntity) { | |||||
| MallUserInfo mui = new MallUserInfo(); | MallUserInfo mui = new MallUserInfo(); | ||||
| mui.updateTenantInfo(tenantEntity); | mui.updateTenantInfo(tenantEntity); | ||||
| return mallUserInfoService.getUserMap(mui); | return mallUserInfoService.getUserMap(mui); | ||||