bugfix

src/main/java/com/caimei365/user/model/dto/ClubOnlineDto.java

@@ -93,7 +93,7 @@ public class ClubOnlineDto implements Serializable {
     /**
      * 若为医美分类下的门诊和医院则需要填写科室。
      */
-    @ApiModelProperty("若为医美分类下的门诊和医院则需要填写科室")
+    @ApiModelProperty("若为医美分类下的门诊和医院则可能需要填写科室")
     private String department;
     /**
      * 医美分类必须上传医疗执业许可证(medicalPracticeLicenseImg)

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -310,13 +310,9 @@ public class RegisterServiceImpl implements RegisterService{
             return ResponseJson.error("参数异常：一级分类不能为空！");
         }
         if (upgradeDto.getFirstClubType() == 1){
+            // 医美分类
             if (upgradeDto.getSecondClubType() == null || StringUtils.isBlank(upgradeDto.getMedicalPracticeLicense())) {
-                return ResponseJson.error("医美分类下参数异常，医美的二级分类或医疗执业许可证");
-            }
-            if (upgradeDto.getSecondClubType() == 2 || upgradeDto.getSecondClubType() == 3) {
-                if (StringUtils.isBlank(upgradeDto.getDepartment())){
-                    return ResponseJson.error("医美分类下,门诊和医院则需要填写科室");
-                }
+                return ResponseJson.error("医美分类下参数异常，医美的二级分类为空或医疗执业许可证为空");
             }
         }
         Integer userIdByEmail = baseMapper.getUserIdByEmail(upgradeDto.getContractEmail());
@@ -422,6 +418,7 @@ public class RegisterServiceImpl implements RegisterService{
      * @return ClubPo
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseJson clubOnline(ClubOnlineDto onlineDto, HttpHeaders headers) {
         Integer isAgreed = onlineDto.getIsAgreed();
         // 打印IP
@@ -452,13 +449,10 @@ public class RegisterServiceImpl implements RegisterService{
             // 机构名称检查
             String nameCheck = ValidateUtil.validateClubName(onlineDto.getName());
             if (nameCheck != null) {return ResponseJson.error(nameCheck);}
-            Integer clubCount = loginMapper.getClubCountByClubName(onlineDto.getName());
-            if (clubCount != null && clubCount > 0) {
-                return ResponseJson.error("该名称已存在，请拨打电话：0755-22907771，联系采美客服");
-            }
             if (onlineDto.getFirstClubType() == 1){
-                if (onlineDto.getSecondClubType() == null || StringUtils.isBlank(onlineDto.getDepartment()) || StringUtils.isBlank(onlineDto.getMedicalPracticeLicense())) {
-                    return ResponseJson.error("医美分类下参数异常");
+                // 医美分类
+                if (onlineDto.getSecondClubType() == null || StringUtils.isBlank(onlineDto.getMedicalPracticeLicense())) {
+                    return ResponseJson.error("医美分类下参数异常，医美的二级分类为空或医疗执业许可证为空");
                 }
             }
         }
@@ -800,6 +794,7 @@ public class RegisterServiceImpl implements RegisterService{
      * @return ShopPo
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseJson updateShopApply(ShopApplyDto shop, HttpHeaders headers) {
         if (null == shop || null == shop.getUserId()) {
             return ResponseJson.error("参数异常：用户Id不能为空！");

src/main/resources/bootstrap.yml

@@ -9,5 +9,5 @@ spring:
     config:                             # Config客户端配置
       profile: @activatedProperties@    # 启用配置后缀名称
       label: master                     # 分支名称
-      uri: http://47.119.112.46:18001   # 配置中心地址
+      uri: http://120.79.162.1:18001          # 配置中心地址
       name: user                        # 配置文件名称

src/main/resources/mapper/RegisterMapper.xml

@@ -10,8 +10,8 @@
                   values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag})
     </insert>
     <insert id="insertUpgradeClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
-        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`,`contractEmail1`,`linkMan`, `provinceID`, `cityID`,`townID`, `address`, `headpic`, `businessLicenseImage`,`socialCreditCode`,`firstClubType`,`secondClubType`,`department`,`medicalPracticeLicenseImg`,`mainpro`)
-                  values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag},#{contractEmail},#{linkMan},#{provinceId},#{cityId},#{townId},#{address},#{shopPhoto},#{businessLicense},#{socialCreditCode},#{firstClubType},#{secondClubType},#{department},#{medicalPracticeLicense},#{mainProduct})
+        insert into club(`name`, `sname`,     `contractMobile`, `userID`, `addTime`, `status`, `spID`,              `scanFlag`,`contractEmail1`,`linkMan`, `provinceID`, `cityID`,`townID`, `address`, `headpic`, `businessLicenseImage`,`socialCreditCode`,`firstClubType`,`secondClubType`,`department`,`medicalPracticeLicenseImg`,`mainpro`)
+                  values(#{name},#{shortName},#{contractMobile},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag},#{contractEmail},#{linkMan},#{provinceId},#{cityId},#{townId},#{address},#{shopPhoto},#{businessLicense},#{socialCreditCode},#{firstClubType},#{secondClubType},#{department},#{medicalPracticeLicense},#{mainProduct})
     </insert>
     <insert id="insertOperation" parameterType="com.caimei365.user.model.po.OperationPo" keyProperty="id" useGeneratedKeys="true">
         insert into cm_mall_operation_user(`userID`, `clubID`, `shopID`, `userOrganizeID`,`linkName`,`nickName`,`headimgurl`,`userType`,`mobile`,`status`, `unionId`, `openid`,`pcOpenid`, `addTime`, `updateTime`, `bindTime`, `delFlag`)

src/test/java/com/caimei365/user/UserApplicationTests.java

@@ -1,5 +1,6 @@
 package com.caimei365.user;
 
+import com.caimei365.user.utils.ValidateUtil;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
@@ -8,6 +9,8 @@ class UserApplicationTests {
 
     @Test
     void contextLoads() {
+        boolean b = ValidateUtil.validateEmail("182126@qq.com");
+        System.out.println(b);
     }