Merge branch 'dev_v1.3.5_20220929'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java

@@ -58,17 +58,17 @@ public class MusicAlbumSearch extends QueryInfo{
     private Long musicId;
 
     @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
-    private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
+    private ChargeTypeEnum paymentType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
     @ApiModelProperty(hidden = true)
     private List<Long> subjectIdList;
 
-    public ChargeTypeEnum getChargeType() {
-        return chargeType;
+    public ChargeTypeEnum getPaymentType() {
+        return paymentType;
     }
 
-    public void setChargeType(ChargeTypeEnum chargeType) {
-        this.chargeType = chargeType;
+    public void setPaymentType(ChargeTypeEnum paymentType) {
+        this.paymentType = paymentType;
     }
 
     public Long getUserId() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java

@@ -221,6 +221,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);

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

@@ -85,8 +85,8 @@
             <if test="query.auditVersion != null">
                 and t.audit_version_ = #{query.auditVersion}
             </if>
-            <if test="query.chargeType != null">
-                and t.payment_type_ = #{query.chargeType}
+            <if test="query.paymentType != null">
+                and t.payment_type_ = #{query.paymentType}
             </if>
         </where>
         order by t.sort_number_ desc