diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 98591c6bf..61689d1b9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -100,6 +100,9 @@ public class WxMerchant extends BaseEntity { @Transient private Integer rentShopType; + @Transient + private Integer isUse; + /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; @@ -180,7 +183,18 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") private Date topTime; - public Date getTopTime() { + @Transient + private WxProfitSharingReceiver wxProfitSharingReceiver; + + public WxProfitSharingReceiver getWxProfitSharingReceiver() { + return wxProfitSharingReceiver; + } + + public void setWxProfitSharingReceiver(WxProfitSharingReceiver wxProfitSharingReceiver) { + this.wxProfitSharingReceiver = wxProfitSharingReceiver; + } + + public Date getTopTime() { return topTime; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 4b5d25b67..5de9c8f1b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -193,6 +193,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { //分账信息 WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant); if (receiver != null) { + wxMerchant.setWxProfitSharingReceiver(receiver); wxMerchant.setAccountId(receiver.getReceiverAccount()); wxMerchant.setAccountName(receiver.getTrueName()); wxMerchant.setAccountTypeValue(receiver.getReceiverType());