Merge branch 'feature/0721-tenant'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantApplyRecordWrapper.java

@@ -70,6 +70,9 @@ public class TenantApplyRecordWrapper {
     @AllArgsConstructor
 	@ApiModel(" TenantApplyRecord-机构入驻申请记录")
     public static class TenantApplyRecord {
+        @ApiModelProperty("id")
+        private Integer id;
+
         @ApiModelProperty("名称")
         private String name;
 
@@ -107,6 +110,10 @@ public class TenantApplyRecordWrapper {
         @ApiModelProperty("审核理由")
         private String reason;
 
+
+        @ApiModelProperty("简介")
+        private String briefIntroduction;
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTenantController.java

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -53,6 +54,12 @@ public class OpenTenantController {
     public HttpResponseResult<Boolean> bindWechat(@RequestParam("phone") String phone,
                                                   @RequestParam("openId") String openId,
                                                   @RequestParam("code") String code) {
+        if (StringUtils.isEmpty(openId)) {
+            throw new BizException("openId不能为空");
+        }
+        if (StringUtils.isEmpty(phone)) {
+            throw new BizException("手机号不能为空");
+        }
         // 校验验证码
         boolean validCode = smsCodeService.verifyValidCode(phone, code, "LOGIN");
         if (!validCode) {