From 0fa3afdb5f68c018df75c44a2804e118314bb551 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Mon, 26 Aug 2024 19:22:18 +0800 Subject: [PATCH] //offlineActivity --- .../WxOfflineActivityGrantAwardServiceImpl.java | 7 +++++-- .../impl/WxOfflineActivityRecordServiceImpl.java | 13 +++++++++++-- .../service/impl/WxOfflineActivityServiceImpl.java | 6 ++++-- 3 files changed, 20 insertions(+), 6 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 e7fb992bb..f74007b75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -97,7 +97,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity handlerRecordQuery(wxOfflineActivityRecord); WxOfflineActivityRecord limitOne = wxOfflineActivityRecordMapper.selectLimitOne(wxOfflineActivityRecord); Map result = new HashMap<>(); - Integer audting = 0, audi_success = 0, audt_fail = 0; + Integer audting = 0, audi_success = 0, audt_fail = 0,invalid = 0; BigDecimal sum_success = BigDecimal.ZERO, sum_fail = BigDecimal.ZERO; if (limitOne == null) { result.put("cus_name","查无此人"); @@ -116,6 +116,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity sum_success = statistics.getSumMoney(); } else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) { audt_fail = statistics.getCount(); + } else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) { + invalid = statistics.getCount(); } } } @@ -124,7 +126,8 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity result.put("audi_success",audi_success); result.put("sum_success",sum_success); result.put("audt_fail",audt_fail); - result.put("sum_count",audting+audi_success+audt_fail); + result.put("invalid",invalid); + result.put("sum_count",audting+audi_success+audt_fail+invalid); return result; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java index e43a5c69f..5772d7fd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java @@ -4,11 +4,13 @@ import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; +import com.iformall.common.Result; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.OfflineActivityRecordStatistics; import com.iformall.enums.EnumOfflineActivityRecordStatus; import com.iformall.enums.EnumYesOrNo; +import com.iformall.exception.MallinkException; import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxOfflineActivityGrantAwardMapper; import com.iformall.mapper.WxOfflineActivityRecordGrantMapper; @@ -166,6 +168,10 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco wxOfflineActivityRecordMapper.insert(wxOfflineActivityRecord); } else{ + WxOfflineActivityRecord record = wxOfflineActivityRecordMapper.selectById(wxOfflineActivityRecord.getId()); + if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ + throw new MallinkException(Result.ERROR,"订单状态不允许修改"); + } wxOfflineActivityRecord.setAuditRemark(""); wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); wxOfflineActivityRecord.setUpdateDate(now); @@ -192,7 +198,7 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco public Map getStatistics(WxOfflineActivityRecord wxOfflineActivityRecord) { List auditStatusStatistics = wxOfflineActivityRecordMapper.auditStatusStatistics(wxOfflineActivityRecord); Map result = new HashMap<>(); - Integer audting = 0, audi_success = 0, audt_fail = 0; + Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0; for(OfflineActivityRecordStatistics statistics : auditStatusStatistics){ if(EnumOfflineActivityRecordStatus.AUDTING.getCode().equals(statistics.getAuditStatus())){ audting = statistics.getCount(); @@ -200,12 +206,15 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco audi_success = statistics.getCount(); } else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) { audt_fail = statistics.getCount(); + } else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) { + invalid = statistics.getCount(); } } result.put("audting",audting); result.put("audi_success",audi_success); result.put("audt_fail",audt_fail); - result.put("sum_count",audting+audi_success+audt_fail); + result.put("invalid",invalid); + result.put("sum_count",audting+audi_success+audt_fail+invalid); return result; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java index 9813fa9b7..29a9790fe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityServiceImpl.java @@ -89,7 +89,7 @@ public class WxOfflineActivityServiceImpl implements WxOfflineActivityService{ wxOfflineActivityRecord.setNotMerchantIdList(merchantIds); } List auditStatusStatistics = wxOfflineActivityRecordMapper.auditStatusStatistics(wxOfflineActivityRecord); - Integer audting = 0, audi_success = 0, audt_fail = 0; + Integer audting = 0, audi_success = 0, audt_fail = 0, invalid = 0; for(OfflineActivityRecordStatistics statistics : auditStatusStatistics){ if(EnumOfflineActivityRecordStatus.AUDTING.getCode().equals(statistics.getAuditStatus())){ audting = statistics.getCount(); @@ -97,9 +97,11 @@ public class WxOfflineActivityServiceImpl implements WxOfflineActivityService{ audi_success = statistics.getCount(); } else if (EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(statistics.getAuditStatus())) { audt_fail = statistics.getCount(); + }else if (EnumOfflineActivityRecordStatus.INVALID.getCode().equals(statistics.getAuditStatus())) { + invalid = statistics.getCount(); } } - activity.setRecordCount(audting+audi_success+audt_fail); + activity.setRecordCount(audting+audi_success+audt_fail+invalid); activity.setWaitRecordCount(audting); activity.setSuccessRecordCount(audi_success);