diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java index 9206e5aec..56478ad81 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java @@ -65,6 +65,19 @@ public class WxMerchant implements Serializable { @Transient private Integer receivePeriod; + /*账户类型**/ + @Transient + private Integer accountTypeValue; + + /*账户ID**/ + @Transient + private String accountId; + + /*账户名**/ + @Transient + private String accountName; + + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -228,6 +241,31 @@ public class WxMerchant implements Serializable { this.receivePeriod = receivePeriod; } + + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public String getAccountId() { + return accountId; + } + + public void setAccountId(String accountId) { + this.accountId = accountId; + } + + public Integer getAccountTypeValue() { + return accountTypeValue; + } + + public void setAccountTypeValue(Integer accountTypeValue) { + this.accountTypeValue = accountTypeValue; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java index 09fa151da..15224d9e8 100644 --- a/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java +++ b/mallinkService/src/main/java/com/simple/enums/EnumProfitSharingReceiverType.java @@ -4,10 +4,10 @@ package com.simple.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumProfitSharingReceiverType { - PROFIT_SHARING_RECEIVER_MERCHANT_ID(1, "MERCHANT_ID"), - PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID(2, "PERSONAL_WECHATID"), - PROFIT_SHARING_RECEIVER_PERSONAL_OPENID(3, "PERSONAL_OPENID"), - PROFIT_SHARING_RECEIVER_PERSONAL_SUB_OPENID(4, "PERSONAL_SUB_OPENID"), + PROFIT_SHARING_RECEIVER_MERCHANT_ID(0, "MERCHANT_ID"), + PROFIT_SHARING_RECEIVER_PERSONAL_WECHATID(1, "PERSONAL_WECHATID"), + PROFIT_SHARING_RECEIVER_PERSONAL_OPENID(2, "PERSONAL_OPENID"), + PROFIT_SHARING_RECEIVER_PERSONAL_SUB_OPENID(3, "PERSONAL_SUB_OPENID"), ; public static EnumProfitSharingReceiverType getEnum(Integer code) {