|
|
|
@@ -26,6 +26,7 @@ import com.iformall.mapper.WxRaffleActivityRecordMapper; |
|
|
|
import com.iformall.service.ExcelService; |
|
|
|
import com.iformall.service.MallUserInfoService; |
|
|
|
import com.iformall.service.WxRaffleActivityService; |
|
|
|
import com.iformall.service.WxShopService; |
|
|
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
@@ -58,6 +59,10 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { |
|
|
|
@Autowired |
|
|
|
MallUserInfoService mallUserInfoService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired |
|
|
|
WxShopService wxShopService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
ExcelService excelService; |
|
|
|
|
|
|
|
@@ -177,6 +182,11 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { |
|
|
|
|
|
|
|
Map<Long,MallUserInfo> userMap = getMallUserInfoMap(tenantEntity); |
|
|
|
|
|
|
|
Map<Long,String> merchantShopNumberMap = null; |
|
|
|
if (null != midList && midList.size() > 0 ) { |
|
|
|
merchantShopNumberMap = wxShopService.getMerchantShopNumberMap(tenantEntity, midList); |
|
|
|
} |
|
|
|
|
|
|
|
for (WxRaffleActivityRecord _r : recordList) { |
|
|
|
if (null != _r.getActivityId()) { |
|
|
|
WxRaffleActivity _a = activityMap.get(_r.getActivityId()); |
|
|
|
@@ -190,7 +200,12 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { |
|
|
|
if (null != _m) { |
|
|
|
_r.setMerchantName(_m.getName()); |
|
|
|
} |
|
|
|
|
|
|
|
if (null != merchantShopNumberMap && merchantShopNumberMap.containsKey(_r.getMerchantId())) { |
|
|
|
_r.setShopNumber(merchantShopNumberMap.get(_r.getMerchantId())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
_r.setRecordItemList(getActivityRecordItemListByRecordId(aidList,_r.getId(),_r)); |
|
|
|
_r.setItemDetail(_r.generateItemDetaiJson(userMap)); |
|
|
|
|
|
|
|
|