Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
378c60b862
3 changed files with 23 additions and 4 deletions
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantItem.java
  3. +19
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityItem.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java View File

@@ -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,"用户手机号为空");
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityGrantItem.java View File

@@ -35,7 +35,7 @@ public class WxOfflineActivityGrantItem extends TenantEntity {
private Long grantId;

/**
* 发放奖励模式
* 发放奖励模式EnumOfflineActivityAwardsModeType
*/
@TableField(value = "grant_awards_mode")
private Integer grantAwardsMode;


+ 19
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityItem.java View File

@@ -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;
}

/**
* 参与金额


Loading…
Cancel
Save