Przeglądaj źródła

//merchantapply

release_toaliyun_real
xhxu 3 lat temu
rodzic
commit
410381d5ee
2 zmienionych plików z 5 dodań i 3 usunięć
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java
  2. +2
    -0
      mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml

+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantReceiverApplyVo.java Wyświetl plik

@@ -16,11 +16,11 @@ public class WxMerchantReceiverApplyVo extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName")
private String merchantName; private String merchantName;
@io.swagger.annotations.ApiModelProperty(value="商户联系人",name="linkPhone")
@io.swagger.annotations.ApiModelProperty(value="商户联系人",name="merchantlinkPerson")
private String merchantlinkPerson; private String merchantlinkPerson;
@io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone")
@io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="merchantLinkPhone")
private String merchantLinkPhone; private String merchantLinkPhone;
@io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status")
@io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="merchantStatus")
private Integer merchantStatus; private Integer merchantStatus;


private Long applyId; private Long applyId;


+ 2
- 0
mallinkService/src/main/resources/mapper/WxProfitSharingReceiverApplyMapper.xml Wyświetl plik

@@ -193,6 +193,8 @@
and m.`status` = #{merchantStatus} and m.`status` = #{merchantStatus}
</if> </if>


and wpsra.`applyment_state` is not null

<if test=" null != tenantId and '' != tenantId"> <if test=" null != tenantId and '' != tenantId">
and wpsra.`tenant_id` = #{tenantId} and wpsra.`tenant_id` = #{tenantId}
</if> </if>


Ładowanie…
Anuluj
Zapisz