From 73d5008a9af0f26cfc0d7aad9838869c545cf46d Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Fri, 15 Nov 2024 22:34:47 +0800 Subject: [PATCH] //offlineActivity --- .../WxOfflineActivityGrantAwardServiceImpl.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 5d500a5e0..3c706eb19 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -99,7 +99,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Override public Map getRecordStatistics(WxOfflineActivityRecord wxOfflineActivityRecord) { - handlerRecordQuery(wxOfflineActivityRecord); + handlerRecordQuery(null,wxOfflineActivityRecord); WxOfflineActivityRecord limitOne = wxOfflineActivityRecordMapper.selectLimitOne(wxOfflineActivityRecord); Map result = new HashMap<>(); Integer audting = 0, audi_success = 0, audt_fail = 0,invalid = 0; @@ -138,14 +138,16 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Override public List getRecordList(WxOfflineActivityRecord wxOfflineActivityRecord) { - handlerRecordQuery(wxOfflineActivityRecord); + handlerRecordQuery(null,wxOfflineActivityRecord); List recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),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) { wxOfflineActivityRecord.setId(-1l); return; @@ -453,6 +455,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity recordQ.setActivityId(activity.getId()); recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone()); recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); + handlerRecordQuery(activity,recordQ); List wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ); if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) { throw new MallinkException(Result.ERROR, "未查询到活动订单"); @@ -802,7 +805,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Override public void recordExport(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord) { - handlerRecordQuery(wxOfflineActivityRecord); + handlerRecordQuery(null,wxOfflineActivityRecord); List recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); wxOfflineActivityRecordService.handlerRecordList(wxOfflineActivityRecord,wxOfflineActivityRecord.getActivityId(),recordList); excelService.exportExcel(recordList, null, "用户参加活动订单列表", WxOfflineActivityRecord.class, "用户参加活动订单列表.xlsx", response, false);