| @@ -42,37 +42,38 @@ public class WxMerchant extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| @Excel(name="租期开始时间",width = 20,format="yyyy-MM-dd",orderNum = "4") | @Excel(name="租期开始时间",width = 20,format="yyyy-MM-dd",orderNum = "4") | ||||
| @io.swagger.annotations.ApiModelProperty(value="租期开始时间",name="rentalStartDate") | |||||
| private Date rentalStartDate; | private Date rentalStartDate; | ||||
| @Transient | @Transient | ||||
| @Excel(name="租期结束时间",width = 20,format="yyyy-MM-dd",orderNum = "5") | @Excel(name="租期结束时间",width = 20,format="yyyy-MM-dd",orderNum = "5") | ||||
| @io.swagger.annotations.ApiModelProperty(value="租期结束时间",name="rentalEndDate") | |||||
| private Date rentalEndDate; | private Date rentalEndDate; | ||||
| /*单价**/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="单价",name="price") | |||||
| private BigDecimal price; | private BigDecimal price; | ||||
| /*单价**/ | |||||
| @Transient | @Transient | ||||
| private Integer receivePeriod; | private Integer receivePeriod; | ||||
| /*账户类型**/ | |||||
| @Transient | @Transient | ||||
| @Excel(name="账户类型",width = 20,orderNum = "7",replace = {"_null","商户号_0","微信号_1"}) | @Excel(name="账户类型",width = 20,orderNum = "7",replace = {"_null","商户号_0","微信号_1"}) | ||||
| @io.swagger.annotations.ApiModelProperty(value="账户类型",name="accountTypeValue") | |||||
| private Integer accountTypeValue; | private Integer accountTypeValue; | ||||
| /*账户ID**/ | |||||
| @Transient | @Transient | ||||
| @Excel(name="账户号",width = 20,orderNum = "8") | @Excel(name="账户号",width = 20,orderNum = "8") | ||||
| @io.swagger.annotations.ApiModelProperty(value="账户ID",name="accountId") | |||||
| private String accountId; | private String accountId; | ||||
| /*账户名**/ | |||||
| @Transient | @Transient | ||||
| @Excel(name="账户名",width = 20,orderNum = "9") | @Excel(name="账户名",width = 20,orderNum = "9") | ||||
| @io.swagger.annotations.ApiModelProperty(value="账户名",name="accountName") | |||||
| private String accountName; | private String accountName; | ||||
| /*账户参数**/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="账户参数",name="accountParameter") | |||||
| private String accountParameter; | private String accountParameter; | ||||
| @Transient | @Transient | ||||
| @@ -177,6 +178,18 @@ public class WxMerchant extends BaseEntity { | |||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public String getWeaAppPath() { | |||||
| if(id == null) | |||||
| return "pages/index/index"; | |||||
| return "pages/index/index?type=md&id=" + id; | |||||
| } | |||||
| public String getWeaAppScene() { | |||||
| if(id == null) | |||||
| return ""; | |||||
| return "t:md:" + id; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||