Explorar el Código

[商户][修改[分账账户A端显示]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
8fb2a96b97
Se han modificado 2 ficheros con 16 adiciones y 1 borrados
  1. +15
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 15
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Ver fichero

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



+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Ver fichero

@@ -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());


Cargando…
Cancelar
Guardar