| @@ -99,7 +99,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| @Override | @Override | ||||
| public Map<String, Object> getRecordStatistics(WxOfflineActivityRecord wxOfflineActivityRecord) { | public Map<String, Object> getRecordStatistics(WxOfflineActivityRecord wxOfflineActivityRecord) { | ||||
| handlerRecordQuery(wxOfflineActivityRecord); | |||||
| handlerRecordQuery(null,wxOfflineActivityRecord); | |||||
| WxOfflineActivityRecord limitOne = wxOfflineActivityRecordMapper.selectLimitOne(wxOfflineActivityRecord); | WxOfflineActivityRecord limitOne = wxOfflineActivityRecordMapper.selectLimitOne(wxOfflineActivityRecord); | ||||
| Map<String, Object> result = new HashMap<>(); | Map<String, Object> result = new HashMap<>(); | ||||
| Integer audting = 0, audi_success = 0, audt_fail = 0,invalid = 0; | Integer audting = 0, audi_success = 0, audt_fail = 0,invalid = 0; | ||||
| @@ -138,14 +138,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| @Override | @Override | ||||
| public List<WxOfflineActivityRecord> getRecordList(WxOfflineActivityRecord wxOfflineActivityRecord) { | public List<WxOfflineActivityRecord> getRecordList(WxOfflineActivityRecord wxOfflineActivityRecord) { | ||||
| handlerRecordQuery(wxOfflineActivityRecord); | |||||
| handlerRecordQuery(null,wxOfflineActivityRecord); | |||||
| List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); | List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); | ||||
| wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); | wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); | ||||
| return recordList; | return recordList; | ||||
| } | } | ||||
| private void handlerRecordQuery(WxOfflineActivityRecord wxOfflineActivityRecord){ | |||||
| WxOfflineActivity activity = wxOfflineActivityMapper.selectById(wxOfflineActivityRecord.getActivityId(), wxOfflineActivityRecord.getTenantId()); | |||||
| private void handlerRecordQuery(WxOfflineActivity activity,WxOfflineActivityRecord wxOfflineActivityRecord){ | |||||
| if(activity == null){ | |||||
| activity = wxOfflineActivityMapper.selectById(wxOfflineActivityRecord.getActivityId(), wxOfflineActivityRecord.getTenantId()); | |||||
| } | |||||
| if (activity == null) { | if (activity == null) { | ||||
| wxOfflineActivityRecord.setId(-1l); | wxOfflineActivityRecord.setId(-1l); | ||||
| return; | return; | ||||
| @@ -453,6 +455,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| recordQ.setActivityId(activity.getId()); | recordQ.setActivityId(activity.getId()); | ||||
| recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); | recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); | ||||
| recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); | recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); | ||||
| handlerRecordQuery(activity,recordQ); | |||||
| List<WxOfflineActivityRecord> wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ); | List<WxOfflineActivityRecord> wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ); | ||||
| if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) { | if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) { | ||||
| throw new MallinkException(Result.ERROR, "未查询到活动订单"); | throw new MallinkException(Result.ERROR, "未查询到活动订单"); | ||||
| @@ -802,7 +805,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity | |||||
| @Override | @Override | ||||
| public void recordExport(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord) { | public void recordExport(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord) { | ||||
| handlerRecordQuery(wxOfflineActivityRecord); | |||||
| handlerRecordQuery(null,wxOfflineActivityRecord); | |||||
| List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); | List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); | ||||
| wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); | wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); | ||||
| excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityRecord.class, "用户参加活动订单列表.xlsx", response, false); | excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityRecord.class, "用户参加活动订单列表.xlsx", response, false); | ||||