|
|
|
@@ -619,17 +619,23 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
|
|
|
|
private void handlerGrantData(WxOfflineActivity activity,WxOfflineActivityGrantAward wxOfflineActivityGrantAward,boolean isForPage){ |
|
|
|
|
|
|
|
// List<WxOfflineActivityRecord> wxOfflineActivityRecords = wxOfflineActivityRecordMapper.selectBatchIds(wxOfflineActivityGrantAward.getRecordIds()); |
|
|
|
WxOfflineActivityRecord recordQ = new WxOfflineActivityRecord(); |
|
|
|
recordQ.updateTenantInfo(wxOfflineActivityGrantAward); |
|
|
|
recordQ.setActivityId(activity.getId()); |
|
|
|
recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); |
|
|
|
recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); |
|
|
|
handlerRecordQuery(activity,recordQ); |
|
|
|
List<WxOfflineActivityRecord> wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ); |
|
|
|
List<WxOfflineActivityRecord> wxOfflineActivityRecords = null; |
|
|
|
if (null != wxOfflineActivityGrantAward.getRecordIds() && wxOfflineActivityGrantAward.getRecordIds().size() > 0 ) { |
|
|
|
wxOfflineActivityRecords = wxOfflineActivityRecordMapper.selectBatchIds(wxOfflineActivityGrantAward.getRecordIds()); |
|
|
|
}else { |
|
|
|
WxOfflineActivityRecord recordQ = new WxOfflineActivityRecord(); |
|
|
|
recordQ.updateTenantInfo(wxOfflineActivityGrantAward); |
|
|
|
recordQ.setActivityId(activity.getId()); |
|
|
|
recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); |
|
|
|
recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); |
|
|
|
handlerRecordQuery(activity,recordQ); |
|
|
|
wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ); |
|
|
|
} |
|
|
|
if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) { |
|
|
|
throw new MallinkException(Result.ERROR, "未查询到活动订单"); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(wxOfflineActivityRecords.stream().map(WxOfflineActivityRecord::getCusPhone).distinct().count() != 1){ |
|
|
|
throw new MallinkException(Result.ERROR, "请检查活动订单用户是否为同一人"); |
|
|
|
} |
|
|
|
@@ -974,8 +980,30 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity |
|
|
|
activityGrantObject.put("orderMoneySum",grantAward.getOrderMoneySum()); |
|
|
|
activityGrantObject.put("realName",grantAward.getRealName()); |
|
|
|
activityGrantObject.put("realCard",grantAward.getRealCard()); |
|
|
|
activityGrantObject.put("createByName",grantAward.getCreateBy()!=null?userMap.get(grantAward.getCreateBy()).getName():""); |
|
|
|
activityGrantObject.put("createDate",DateUtils.date2String(grantAward.getCreateDate())); |
|
|
|
//activityGrantObject.put("createByName",grantAward.getCreateBy()!=null?userMap.get(grantAward.getCreateBy()).getName():""); |
|
|
|
//activityGrantObject.put("createDate",DateUtils.date2String(grantAward.getCreateDate())); |
|
|
|
WxOfflineActivityGrantAward grantAwardHistoryQ = new WxOfflineActivityGrantAward(); |
|
|
|
grantAwardHistoryQ.updateTenantInfo(wxOfflineActivity); |
|
|
|
grantAwardHistoryQ.setActivityId(wxOfflineActivity.getId()); |
|
|
|
grantAwardHistoryQ.setCusPhone(grantAward.getCusPhone()); |
|
|
|
List<WxOfflineActivityGrantAward> historyList = wxOfflineActivityGrantAwardMapper.findGrantHistoryList(grantAwardHistoryQ); |
|
|
|
StringBuffer createByNameSb = new StringBuffer(); |
|
|
|
StringBuffer createDateSb = new StringBuffer(); |
|
|
|
if (null != historyList && historyList.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < historyList.size(); i ++ ) { |
|
|
|
WxOfflineActivityGrantAward gah = historyList.get(i); |
|
|
|
Long cu = gah.getCreateBy(); |
|
|
|
MallUserInfo mui = userMap.get(cu); |
|
|
|
if (null != mui) { |
|
|
|
createByNameSb.append(mui.getName()).append(","); |
|
|
|
}else { |
|
|
|
createByNameSb.append("").append(","); |
|
|
|
} |
|
|
|
createDateSb.append(DateUtils.date2String(grantAward.getCreateDate())).append(","); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(grantAward.getLotteryNumList() != null && !grantAward.getLotteryNumList().isEmpty()){ |
|
|
|
activityGrantObject.put("lotteryNum",String.join(";", grantAward.getLotteryNumList())); |
|
|
|
} |
|
|
|
|