From dff45852d5bf3c9fd23f14f844ffed8b6d7a483c Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Sun, 18 Aug 2024 15:01:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?//OfflineActivity=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxOfflineActivityRecordController.java | 20 ++++++++++++++++++- .../domain/po/WxOfflineActivityRecord.java | 2 +- .../EnumOfflineActivityRecordStatus.java | 1 + .../WxOfflineActivityRecordService.java | 1 + ...xOfflineActivityGrantAwardServiceImpl.java | 2 +- .../mapper/WxOfflineActivityRecordMapper.xml | 2 +- 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java index 606ebc417..8fa2f1e10 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java @@ -76,6 +76,9 @@ public class WxOfflineActivityRecordController extends BaseController { @ApiOperation("审核通过") @PostMapping("audiPass") public ResultData audiPass(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { + if(wxOfflineActivityRecord != null){ + return new ResultData(Result.ERROR,"id 不能为空"); + } TenantEntity tenantEntity = getTenantInfo(); wxOfflineActivityRecord.updateTenantInfo(tenantEntity); wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode()); @@ -86,7 +89,9 @@ public class WxOfflineActivityRecordController extends BaseController { @ApiOperation("审核驳回") @PostMapping("audtFail") public ResultData audtFail(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { - + if(wxOfflineActivityRecord != null){ + return new ResultData(Result.ERROR,"id 不能为空"); + } if(StringUtil.isBlank(wxOfflineActivityRecord.getAuditRemark())){ return new ResultData(Result.ERROR,"驳回意见不能为空"); } @@ -96,6 +101,19 @@ public class WxOfflineActivityRecordController extends BaseController { wxOfflineActivityRecordService.auditRecord(wxOfflineActivityRecord,getUserId()); return new ResultData(); } + + @ApiOperation("失效") + @PostMapping("invalid") + public ResultData invalid(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { + if(wxOfflineActivityRecord != null){ + return new ResultData(Result.ERROR,"id 不能为空"); + } + TenantEntity tenantEntity = getTenantInfo(); + wxOfflineActivityRecord.updateTenantInfo(tenantEntity); + wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.INVALID.getCode()); + wxOfflineActivityRecordService.auditRecord(wxOfflineActivityRecord,getUserId()); + return new ResultData(); + } @ApiOperation("查询详情") @GetMapping("getInfoById") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index 29375b1bf..0c66007c5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -165,7 +165,7 @@ public class WxOfflineActivityRecord extends TenantEntity { /** * 审批状态 */ - @Excel(name = "审核状态", width = 20, orderNum = "9", replace = {"审核中_0", "已审批_1", "已驳回_2", "已发奖_10"}) + @Excel(name = "审核状态", width = 20, orderNum = "9", replace = {"审核中_0", "已审批_1", "已驳回_2", "已失效_3", "已发奖_10"}) @TableField(value = "audit_status") private Integer auditStatus; diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityRecordStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityRecordStatus.java index f35718ac5..cb2967530 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityRecordStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumOfflineActivityRecordStatus.java @@ -9,6 +9,7 @@ public enum EnumOfflineActivityRecordStatus { AUDTING(0, "审核中"), AUDI_SUCCESS(1, "审批通过"), AUDT_FAIL(2, "审批拒绝"), + INVALID(3, "失效"), IS_GRANT(10, "已发奖"),; public static EnumOfflineActivityRecordStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityRecordService.java b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityRecordService.java index 2e7601bad..0ca0a919c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityRecordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOfflineActivityRecordService.java @@ -36,4 +36,5 @@ public interface WxOfflineActivityRecordService { void exportData(HttpServletRequest request, HttpServletResponse response, WxOfflineActivityRecord wxOfflineActivityRecord); Integer getWaitAudiCount(TenantEntity tenantInfo); + } 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 ecd0d05ca..e7fb992bb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -314,7 +314,7 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity List anniversaryLotteryNumList = new ArrayList<>(); for (WxOfflineActivityRecord record : wxOfflineActivityRecords) { if(!EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode().equals(record.getAuditStatus())){ - throw new MallinkException(Result.ERROR, "请检查活动订单审核状态"); + throw new MallinkException(Result.ERROR, "请检查活动订单状态"); } if(record.getCreateDate().before(activity.getStartTime()) || record.getCreateDate().after(activity.getEndTime())){ throw new MallinkException(Result.ERROR, "请检查活动时间"); diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml index cc83f9efa..85b1aca7b 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml @@ -164,7 +164,7 @@ `audit_by` = #{auditBy}, `update_date` = #{updateDate} - where id=#{id} + where id = #{id} and `tenant_id` = #{tenantId} From 574b8ceef863ae71bf7ba99bfe613a0863e29d49 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Sun, 18 Aug 2024 15:15:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?//OfflineActivity=20=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxOfflineActivityRecordController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java index 8fa2f1e10..6f73c4173 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java @@ -76,7 +76,7 @@ public class WxOfflineActivityRecordController extends BaseController { @ApiOperation("审核通过") @PostMapping("audiPass") public ResultData audiPass(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { - if(wxOfflineActivityRecord != null){ + if(wxOfflineActivityRecord == null){ return new ResultData(Result.ERROR,"id 不能为空"); } TenantEntity tenantEntity = getTenantInfo(); @@ -89,7 +89,7 @@ public class WxOfflineActivityRecordController extends BaseController { @ApiOperation("审核驳回") @PostMapping("audtFail") public ResultData audtFail(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { - if(wxOfflineActivityRecord != null){ + if(wxOfflineActivityRecord == null){ return new ResultData(Result.ERROR,"id 不能为空"); } if(StringUtil.isBlank(wxOfflineActivityRecord.getAuditRemark())){ @@ -105,7 +105,7 @@ public class WxOfflineActivityRecordController extends BaseController { @ApiOperation("失效") @PostMapping("invalid") public ResultData invalid(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { - if(wxOfflineActivityRecord != null){ + if(wxOfflineActivityRecord == null){ return new ResultData(Result.ERROR,"id 不能为空"); } TenantEntity tenantEntity = getTenantInfo();