琴房时长购买问题修复

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/ContractTemplateTypeEnum.java

@@ -0,0 +1,26 @@
+package com.yonge.cooleshow.common.enums;
+
+import com.yonge.toolset.base.enums.BaseEnum;
+
+public enum ContractTemplateTypeEnum implements BaseEnum<String, ContractTemplateTypeEnum> {
+    PLATFORM("平台协议"), WITHDRAW("提现协议（三方）");
+
+    private String code;
+
+    private String desc;
+
+    ContractTemplateTypeEnum(String desc) {
+        this.code = this.name();
+        this.desc = desc;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/ContractTemplateController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.yonge.cooleshow.biz.dal.enums.ContractTypeEnum;
+import com.yonge.cooleshow.common.enums.ContractTemplateTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -59,6 +60,7 @@ public class ContractTemplateController extends BaseController {
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('contractTemplate/add')")
 	public HttpResponseResult<Object> add(@RequestBody ContractTemplate contractTemplate) {
+		contractTemplate.setType(ContractTemplateTypeEnum.PLATFORM.getCode());
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         
         if(sysUser == null || sysUser.getId() == null){

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ContractTemplate.java

@@ -15,7 +15,7 @@ public class ContractTemplate {
 	private String name;
 	
 	@ApiModelProperty(value = "协议类型",required = false)
-	private String type;
+	private String type ;
 	
 	@ApiModelProperty(value = "协议内容",required = false)
 	private String contractTemplateContent;

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

@@ -93,7 +93,6 @@ public class ContractTemplateServiceImpl extends BaseServiceImpl<Integer, Contra
                 contractTemplate.setModifyBy(userId);
 
                 contractTemplateDao.update(contractTemplate);
-
                 return true;
             }
         } catch (InterruptedException e) {

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

@@ -80,6 +80,7 @@ public class PianoRoomBuyRecordServiceImpl extends ServiceImpl<PianoRoomBuyRecor
         PianoRoomTime pianoRoomTime = pianoRoomTimeService.getOne(Wrappers.<PianoRoomTime>lambdaQuery()
                 .eq(PianoRoomTime::getTeacherId, orderDetailVo.getUserId()));
         if (null == pianoRoomTime) {
+            pianoRoomTime = new PianoRoomTime();
             pianoRoomTime.setTeacherId(orderDetailVo.getUserId());
             pianoRoomTime.setRemainTime(detail.getTimes());
             pianoRoomTimeService.save(pianoRoomTime);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/DistributedLock.java

@@ -102,7 +102,10 @@ public class DistributedLock {
         } catch (BizException e) {
             throw e;
         } catch (ExecutionException e) {
-            String message = e.getCause().getMessage();
+            Throwable cause = e.getCause();
+            cause.printStackTrace();;
+
+            String message = cause.getMessage();
             if(StringUtil.isEmpty(message)){
                 throw new RuntimeException("任务执行异常");
             }else{

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

@@ -94,20 +94,28 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="BaseResultMap" parameterType="map">
-		SELECT * FROM contract_template ORDER BY id_
+		SELECT tct.*,ifnull(u.real_name_,u.username_) latest_operator_ FROM contract_template tct left join sys_user u on tct.modify_by_ = u.id_
+		<where>
+			tct.type_ = 'PLATFORM'
+			<if test="status != null">
+				and tct.status_ = #{status}
+			</if>
+			<if test="type != null">
+				and tct.type_ = #{type}
+			</if>
+			<if test="owner != null">
+				and tct.owner_ = #{owner}
+			</if>
+		</where>
+		ORDER BY id_
 		<include refid="global.limit" />
 	</select>
 
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM contract_template
-	</select>
-
 	<!-- 分页查询 -->
-	<select id="queryPageList" resultMap="ContractTemplateDto"
-		parameterType="map">
-		SELECT tct.*,ifnull(u.real_name_,u.username_) latest_operator_ FROM contract_template tct left join sys_user u on tct.modify_by_ = u.id_ 
+	<select id="queryPageList" resultMap="ContractTemplateDto" parameterType="map">
+		SELECT tct.*,ifnull(u.real_name_,u.username_) latest_operator_ FROM contract_template tct left join sys_user u on tct.modify_by_ = u.id_
 		<where>
+			tct.type_ = 'PLATFORM'
 			<if test="status != null">
 				and tct.status_ = #{status}
 			</if>
@@ -122,10 +130,12 @@
 		<include refid="global.limit" />
 	</select>
 
+
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(tct.id_) FROM contract_template tct
 		<where>
+			tct.type_ = 'PLATFORM'
 			<if test="status != null">
 				and tct.status_ = #{status}
 			</if>
@@ -137,7 +147,7 @@
 			</if>
 		</where>
 	</select>
-	
+
 	<select id="queryLatestContractTemplate" resultMap="BaseResultMap" parameterType="map">
 		SELECT a.* FROM (
 			select