Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumPurchaseWrapper.java

@@ -43,6 +43,9 @@ public class TenantAlbumPurchaseWrapper {
         @ApiModelProperty(value = "排序规则", hidden = true)
         private String orderBy;
 
+
+        @ApiModelProperty("采购状态 WAIT_PAY 待支付   PAID 已付款 CLOSE 已关闭")
+        private String purchaseStatus;
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumPurchaseMapper.xml

@@ -25,6 +25,14 @@
         <include refid="baseColumns"/>,ta.name_ as tenantAlbumName,ta.cover_img_ as tenantAlbumImg
         FROM tenant_album_purchase t
         LEFT JOIN tenant_album ta on t.tenant_album_id_ = ta.id_
+        <where>
+        <if test="param.tenantId != null">
+                AND t.tenant_id_ = #{param.tenantId}
+            </if>
+            <if test="param.purchaseStatus != null and param.purchaseStatus.trim() != ''">
+                AND t.purchase_status_ = #{param.purchaseStatus}
+            </if>
+        </where>
         <choose>
             <when test="param.orderBy != null and param.orderBy.trim() != ''">
                 order by #{param.orderBy}