From bc1f57f48046e59e77411e5adc4a4670c83eb34d Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 7 Dec 2020 17:47:07 +0800 Subject: [PATCH] bug --- .../iformall/controller/market/WxCampaignController.java | 6 ++---- .../src/main/java/com/iformall/enums/EnumScoreType.java | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index fe0dca468..570a569de 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -79,8 +79,7 @@ public class WxCampaignController extends BaseController { } wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); - wxCampaignService.saveOrUpdate(wxCampaign); - return new ResultData(); + return wxCampaignService.saveOrUpdate(wxCampaign); } @ApiOperation(value = "新增接口-小程序路径", notes = "produceType,produceId,pagePath,pageScene必填") @@ -90,8 +89,7 @@ public class WxCampaignController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCampaignController::addByPath"); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.updateTenantInfo(ifParentUpdateAloneTenantInfo()); - wxCampaignService.addForPath(wxCampaign); - return new ResultData(); + return wxCampaignService.addForPath(wxCampaign); } @ApiOperation("根据id更新接口") diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java index 6c8352a90..8e80a70ee 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -17,7 +17,8 @@ public enum EnumScoreType { SPEND_CREDIT(10, "新增积分"), CHANGE_CREDIT(11, "积分兑换"), REDUCE_CREDIT(12, "消费积分"), - ACTIVITY_JOIN(13, "活动报名"),; + ACTIVITY_JOIN(13, "活动报名"), + CLEAN_CREDIT(14, "积分清零计划"),; public static EnumScoreType getEnum(Integer code) { for (EnumScoreType value : values()) {