From 378c60b862a46dcfb43f774f76fbe7b014762cb1 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Fri, 11 Apr 2025 13:09:27 +0800 Subject: [PATCH] fix --- .../WxOfflineActivityGrantController.java | 6 +++--- .../domain/po/WxOfflineActivityGrantItem.java | 2 +- .../domain/po/WxOfflineActivityItem.java | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java index b1827e0cf..003bc5422 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java @@ -121,9 +121,9 @@ public class WxOfflineActivityGrantController extends BaseController { if(wxOfflineActivityGrantAward.getActivityId() == null){ return new ResultData(Result.ERROR,"活动ID为空"); } - if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ - return new ResultData(Result.ERROR,"请选择订单"); - } +// if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){ +// return new ResultData(Result.ERROR,"请选择订单"); +// } if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ throw new MallinkException(Result.ERROR,"用户手机号为空"); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantItem.java index e22084049..4e2d8b38e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantItem.java @@ -35,7 +35,7 @@ public class WxOfflineActivityGrantItem extends TenantEntity { private Long grantId; /** - * 发放奖励模式 + * 发放奖励模式EnumOfflineActivityAwardsModeType */ @TableField(value = "grant_awards_mode") private Integer grantAwardsMode; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityItem.java index a5de55239..156ce342d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityItem.java @@ -10,6 +10,9 @@ import java.util.List; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.OfflineActivityGrantRule; +import com.iformall.enums.EnumOfflineActivityMode; +import com.iformall.enums.EnumOfflineActivityType; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -40,6 +43,14 @@ public class WxOfflineActivityItem extends TenantEntity { */ @TableField(value = "type") private Integer type; + @TableField(exist = false) + private String typeName; + public String getTypeName() { + if (null != type) { + return EnumOfflineActivityType.getEnum(type).getMessage(); + } + return null; + } /** * 活动项名称 @@ -52,6 +63,14 @@ public class WxOfflineActivityItem extends TenantEntity { */ @TableField(value = "mode_type") private Integer modeType; + @TableField(exist = false) + private String modeTypeName; + public String getModeTypeName() { + if (null != modeType) { + return EnumOfflineActivityMode.getEnum(modeType).getMessage(); + } + return null; + } /** * 参与金额