记得上下班打卡 | git大法好,push需谨慎

Commit 732de166 authored by 胡佳晨's avatar 胡佳晨

修改 后台接口

parent 34e4a7ab
...@@ -43,6 +43,8 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable { ...@@ -43,6 +43,8 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
private List<GoblinMixDetailsItemVo> item; private List<GoblinMixDetailsItemVo> item;
@ApiModelProperty(position = 22, value = "状态[6-活动中|7-停用|9-等待开始|10-活动结束]") @ApiModelProperty(position = 22, value = "状态[6-活动中|7-停用|9-等待开始|10-活动结束]")
private Integer status; private Integer status;
@ApiModelProperty(position = 24, value = "IOS支付方式[0-第三方支付|1-苹果支付]")
private Integer payType;
private static final GoblinMixAppDetailsVo obj = new GoblinMixAppDetailsVo(); private static final GoblinMixAppDetailsVo obj = new GoblinMixAppDetailsVo();
...@@ -70,6 +72,7 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable { ...@@ -70,6 +72,7 @@ public class GoblinMixAppDetailsVo implements Serializable, Cloneable {
this.setLimit(source.getLimit()); this.setLimit(source.getLimit());
this.setWhiteType(source.getWhiteType()); this.setWhiteType(source.getWhiteType());
this.setItem(source.getItem()); this.setItem(source.getItem());
this.setPayType(source.getPayType());
return this; return this;
} }
} }
...@@ -64,6 +64,8 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable { ...@@ -64,6 +64,8 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
private BigDecimal sellPrice; private BigDecimal sellPrice;
@ApiModelProperty(position = 23, value = "原价") @ApiModelProperty(position = 23, value = "原价")
private BigDecimal price; private BigDecimal price;
@ApiModelProperty(position = 24, value = "IOS支付方式[0-第三方支付|1-苹果支付]")
private Integer payType;
private static final GoblinMixDetailsVo obj = new GoblinMixDetailsVo(); private static final GoblinMixDetailsVo obj = new GoblinMixDetailsVo();
...@@ -102,6 +104,7 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable { ...@@ -102,6 +104,7 @@ public class GoblinMixDetailsVo implements Serializable, Cloneable {
this.setStatus(6); this.setStatus(6);
this.setSellPrice(sellPrice); this.setSellPrice(sellPrice);
this.setPrice(price); this.setPrice(price);
this.setPayType(source.getPayType());
return this; return this;
} }
} }
...@@ -47,6 +47,8 @@ public class GoblinMixDetailsParam implements Serializable, Cloneable { ...@@ -47,6 +47,8 @@ public class GoblinMixDetailsParam implements Serializable, Cloneable {
private String whiteUrl; private String whiteUrl;
@ApiModelProperty(position = 20, value = "配置详情") @ApiModelProperty(position = 20, value = "配置详情")
private List<GoblinMixDetailsItemParam> item; private List<GoblinMixDetailsItemParam> item;
@ApiModelProperty(position = 19, value = "IOS支付方式[0-第三方支付|1-苹果支付]")
private Integer payType;
private static final GoblinMixDetailsParam obj = new GoblinMixDetailsParam(); private static final GoblinMixDetailsParam obj = new GoblinMixDetailsParam();
......
...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.io.Serializable; import java.io.Serializable;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
...@@ -131,6 +132,11 @@ public class GoblinMix implements Serializable { ...@@ -131,6 +132,11 @@ public class GoblinMix implements Serializable {
*/ */
private String whiteUrl; private String whiteUrl;
/**
* IOS支付方式[0-第三方支付|1-苹果支付]
*/
private Integer payType;
/** /**
* 是否删除[0-否|1-是] * 是否删除[0-否|1-是]
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment