Merge remote-tracking branch 'origin/developer' into developerD

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

@@ -708,10 +708,11 @@ public class RegisterServiceImpl implements RegisterService {
         if (nameCheck != null) {
             return ResponseJson.error(nameCheck);
         }
-        String socialCodeResult = ValidateUtil.validateSocialCreditCode(upgradeDto.getSocialCreditCode());
+        // 版本去除 营业执照编号验证
+        /*String socialCodeResult = ValidateUtil.validateSocialCreditCode(upgradeDto.getSocialCreditCode());
         if (socialCodeResult != null) {
             return ResponseJson.error(socialCodeResult);
-        }
+        }*/
         // 更新用户数据 user
         UserPo user = new UserPo();
         user.setUserId(upgradeDto.getUserId());
@@ -755,7 +756,9 @@ public class RegisterServiceImpl implements RegisterService {
         // 营业执照
         club.setBusinessLicense(upgradeDto.getBusinessLicense());
         // 统一社会信用代码
-        club.setSocialCreditCode(upgradeDto.getSocialCreditCode());
+        if (StringUtils.isNotBlank(upgradeDto.getSocialCreditCode())) {
+            club.setSocialCreditCode(upgradeDto.getSocialCreditCode());
+        }
         // 分类: 1医美, 2生美
         club.setFirstClubType(upgradeDto.getFirstClubType());
         if (upgradeDto.getFirstClubType() == 1) {

src/main/resources/mapper/ClubMapper.xml

@@ -514,7 +514,7 @@
         from cm_prior_keyword cpk
         left join cm_user_search_frequency cusf on cpk.searchId = cusf.id
         WHERE cpk.delFlag = 0 AND cusf.delStatus = 1
-        order by cpk.addTime desc
+        order by cusf.dynamicStatus DESC, cpk.addTime desc
     </select>
 
     <select id="findKeywordExist" resultType="java.lang.Integer">
@@ -522,6 +522,7 @@
         from cm_user_search_frequency
         where keyword = #{keyword}
           and delstatus = 1
+        limit 1
     </select>
 
     <insert id="insertLabel">