3 лет назад · 101ddc2caa
--- a/cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java
+++ b/cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java
@@ -1,5 +1,6 @@
 
				 package com.yonge.cooleshow.biz.dal.dto.search;
			
 
				 
			
 
				+import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
			
 
				 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
			
 
				 import com.yonge.toolset.base.page.QueryInfo;
			
 
				 import com.yonge.toolset.base.util.StringUtil;
			
@@ -56,9 +57,20 @@ public class MusicAlbumSearch extends QueryInfo{
 
				     @ApiModelProperty("曲目ID")
			
 
				     private Long musicId;
			
 
				 
			
 
				+    @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
			
 
				+    private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
			
 
				+
			
 
				     @ApiModelProperty(hidden = true)
			
 
				     private List<Long> subjectIdList;
			
 
				 
			
 
				+    public ChargeTypeEnum getChargeType() {
			
 
				+        return chargeType;
			
 
				+    }
			
 
				+
			
 
				+    public void setChargeType(ChargeTypeEnum chargeType) {
			
 
				+        this.chargeType = chargeType;
			
 
				+    }
			
 
				+
			
 
				     public Long getUserId() {
			
 
				         return userId;
			
 
				     }
			
--- a/cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java
+++ b/cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java
@@ -128,6 +128,11 @@ public class ContractServiceImpl implements ContractService {
 
				 
			
 
				         Map<String, Object> params = new HashMap<>();
			
 
				         String companyName = sysConfigService.findConfigValue(SysConfigConstant.COMPANY_NAME);
			
 
				+        if (contractType.equals(ContractTemplateTypeEnum.REGISTER)) {
			
 
				+            params.put("contractName", "用户注册协议");
			
 
				+        } else {
			
 
				+            params.put("contractName", "产品与服务协议");
			
 
				+        }
			
 
				         params.put("companyName", companyName);
			
 
				         params.put("companySealPicture", sysConfigService.findConfigValue(SysConfigConstant.COMPANY_SEAL_PICTURE));
			
 
				         params.put("contractMainContent", mainContent);
			
--- a/cooleshow-user/user-biz/src/main/resources/config/contracts/latest_contract_template.ftl
+++ b/cooleshow-user/user-biz/src/main/resources/config/contracts/latest_contract_template.ftl
@@ -82,7 +82,7 @@
 
				 </head>
			
 
				 <body style="font-family:'SimSun'">
			
 
				     <div class="container">
			
 
				-        <h1>《产品与服务协议》</h1>
			
 
				+        <h1>《${contractName}》</h1>
			
 
				                             甲方：${companyName} <br/>
			
 
				 
			
 
				         <div style="display: flex;">
			
--- a/cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml
+++ b/cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml
@@ -85,6 +85,9 @@
 
				             <if test="query.auditVersion != null">
			
 
				                 and t.audit_version_ = #{query.auditVersion}
			
 
				             </if>
			
 
				+            <if test="query.chargeType != null">
			
 
				+                and t.payment_type_ = #{query.chargeType}
			
 
				+            </if>
			
 
				         </where>
			
 
				         order by t.sort_number_ desc
			
 
				         <if test="query.sortBy != null">