Home Explore Help
Sign In
yonge
/
cooleshow
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'dev_v1.3.5_20220929' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.5_20220929

Eric 2 years ago
parent
618c7af231 d006e78a65
commit
35bf17d198
4 changed files with 21 additions and 1 deletions
Unified View Show Diff Stats
  1. 12 0
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java
  2. 5 0
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java
  3. 1 1
      cooleshow-user/user-biz/src/main/resources/config/contracts/latest_contract_template.ftl
  4. 3 0
      cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

+ 12 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicAlbumSearch.java
View File 

@@ -1,5 +1,6 @@
 
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 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.cooleshow.common.enums.YesOrNoEnum;
 
 import com.yonge.toolset.base.page.QueryInfo;
 
 import com.yonge.toolset.base.page.QueryInfo;
 
 import com.yonge.toolset.base.util.StringUtil;
 
 import com.yonge.toolset.base.util.StringUtil;
 
@@ -56,9 +57,20 @@ public class MusicAlbumSearch extends QueryInfo{
 
     @ApiModelProperty("曲目ID")
 
     @ApiModelProperty("曲目ID")
 
     private Long musicId;
 
     private Long musicId;
 
 
 
+    @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
 
+    private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
+
 
     @ApiModelProperty(hidden = true)
 
     @ApiModelProperty(hidden = true)
 
     private List<Long> subjectIdList;
 
     private List<Long> subjectIdList;
 
 
 
+    public ChargeTypeEnum getChargeType() {
 
+        return chargeType;
 
+    }
 
+
 
+    public void setChargeType(ChargeTypeEnum chargeType) {
 
+        this.chargeType = chargeType;
 
+    }
 
+
 
     public Long getUserId() {
 
     public Long getUserId() {
 
         return userId;
 
         return userId;
 
     }
 
     }

+ 5 - 0
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ContractServiceImpl.java
View File 

@@ -128,6 +128,11 @@ public class ContractServiceImpl implements ContractService {
 
 
 
         Map<String, Object> params = new HashMap<>();
 
         Map<String, Object> params = new HashMap<>();
 
         String companyName = sysConfigService.findConfigValue(SysConfigConstant.COMPANY_NAME);
 
         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("companyName", companyName);
 
         params.put("companySealPicture", sysConfigService.findConfigValue(SysConfigConstant.COMPANY_SEAL_PICTURE));
 
         params.put("companySealPicture", sysConfigService.findConfigValue(SysConfigConstant.COMPANY_SEAL_PICTURE));
 
         params.put("contractMainContent", mainContent);
 
         params.put("contractMainContent", mainContent);

+ 1 - 1
cooleshow-user/user-biz/src/main/resources/config/contracts/latest_contract_template.ftl
View File 

@@ -82,7 +82,7 @@
 
 </head>
 
 </head>
 
 <body style="font-family:'SimSun'">
 
 <body style="font-family:'SimSun'">
 
     <div class="container">
 
     <div class="container">
 
-        <h1>《产品与服务协议》</h1>
 
+        <h1>《${contractName}》</h1>
 
                             甲方：${companyName} <br/>
 
                             甲方：${companyName} <br/>
 
 
 
         <div style="display: flex;">
 
         <div style="display: flex;">

+ 3 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml
View File 

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