Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

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

@@ -25,12 +25,6 @@ public interface ContractTemplateService extends BaseService<Integer, ContractTe
 	boolean enableContract(Integer id, Long userId);
 
 	/**
-	 * 更新协议版本
-	 * @return
-	 */
-	boolean updateContractVersion();
-	
-	/**
 	 * 查询最新启用的协议模板
 	 * @param contractType
 	 * @return
@@ -39,6 +33,6 @@ public interface ContractTemplateService extends BaseService<Integer, ContractTe
 	
 	boolean createContractTemplate(ContractTemplate contractTemplate);
 	
-	boolean updateContractTempalte(ContractTemplate contractTemplate);
+	//boolean updateContractTempalte(ContractTemplate contractTemplate);
 
 }

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

@@ -94,12 +94,6 @@ public class ContractTemplateServiceImpl extends BaseServiceImpl<Integer, Contra
     }
 
     @Override
-    public boolean updateContractVersion() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    @Override
     public ContractTemplate queryLatestContractTemplate(ContractTemplateTypeEnum contractType) {
         String code = contractType.getSource().getCode();
         ContractTemplate ContractTemplate = contractTemplateDao.queryLatestContractTemplate(
@@ -135,7 +129,7 @@ public class ContractTemplateServiceImpl extends BaseServiceImpl<Integer, Contra
         return false;
     }
 
-    @Override
+    /*@Override
     @Transactional
     public boolean updateContractTempalte(ContractTemplate contractTemplate) {
         RLock lock = redissonClient.getLock(LOCK_NAME);
@@ -159,6 +153,6 @@ public class ContractTemplateServiceImpl extends BaseServiceImpl<Integer, Contra
             lock.unlock();
         }
         return false;
-    }
+    }*/
 
 }

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

@@ -80,7 +80,7 @@ public class SysUserContractRecordServiceImpl extends ServiceImpl<SysUserContrac
         if (null == contractRecord) {
             ContractTemplate contractTemplate = contractTemplateService.queryLatestContractTemplate(contractType);
             if (null == contractTemplate) {
-                return HttpResponseResult.failed(HttpStatus.FORBIDDEN, "未找到协议");
+                return HttpResponseResult.failed("未找到协议");
             }
             contractRecord = new SysUserContractRecord();
             Long contractNo = idGeneratorService.generatorId("contractNo");