协议接口修改

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

@@ -214,6 +214,9 @@ public class ContractServiceImpl implements ContractService {
             return HttpResponseResult.failed("最新协议模板查询失败");
         }
         String mainContent = tenantContractTemplate.getContractTemplateContent();
+        if(StringUtils.isEmpty(mainContent)){
+            return HttpResponseResult.failed("没有协议内容");
+        }
 
         Map<String, Object> params = new HashMap<>();
         String companyName = sysConfigService.findConfigValue(SysConfigConstant.COMPANY_NAME);

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

@@ -40,8 +40,7 @@
             <include refid="baseColumns" />,
             tmp.name_ as templateName,
             tmp.type_ as templateType,
-            contract_no_ as contractNo,
-            version_ as version
+            tmp.version_ as version
         FROM sys_user_contract_record t
         LEFT JOIN contract_template tmp on t.contract_id_ = tmp.id_
         <where>

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysUserContractRecordController.java

@@ -58,12 +58,23 @@ public class SysUserContractRecordController extends BaseController {
         return HttpResponseResult.succeed(sysUserContractRecordService.checkContractSign(user.getId(), SysUserType.TEACHER, contractType));
     }
 
-    @ApiOperation("查询最新启用的协议模板")
+    @ApiOperation("查看协议-获取协议模板")
     @GetMapping(value = "/queryLatestContractTemplate")
     public HttpResponseResult<ContractTemplate> queryLatestContractTemplate(@ApiParam(value = "业务类型 REGISTER 注册 COURSES 课程购买 PRODUCT 产品 WITHDRAW 提现", required = true) @RequestParam("contractType") ContractTemplateTypeEnum contractType) {
         return succeed(contractTemplateService.queryLatestContractTemplate(contractType));
     }
 
+    @ApiOperation("查看协议-获取协议内容")
+    @GetMapping(value = "/queryContract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public HttpResponseResult<String> queryContract(
+            @ApiParam(value = "协议类型", required = true) @RequestParam("contractType") ContractTemplateTypeEnum contractType) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return contractService.queryProductContract(user.getId(),SysUserType.TEACHER,contractType);
+    }
+
     @ApiOperation("签署协议")
     @GetMapping(value = "/sign", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public HttpResponseResult<Boolean> sign(
@@ -110,16 +121,7 @@ public class SysUserContractRecordController extends BaseController {
         return HttpResponseResult.succeed(true);
     }
 
-    @ApiOperation("查看协议")
-    @GetMapping(value = "/queryContract", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public HttpResponseResult<String> queryContract(
-            @ApiParam(value = "协议类型", required = true) @RequestParam("contractType") ContractTemplateTypeEnum contractType) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return contractService.queryProductContract(user.getId(),SysUserType.TEACHER,contractType);
-    }
+
 
 }