小程序问题修复

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantAuthServiceImpl.java

@@ -142,6 +142,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
         Page<MerchantAuth> page = this.lambdaQuery()
                 .like(StringUtils.notEmpty(param.getStoreName()), MerchantAuth::getStoreName, param.getStoreName())
                 .eq(StringUtils.notEmpty(userId),MerchantAuth::getApplicant,userId)
+                .orderByDesc(MerchantAuth::getReviewStatus)
                 .orderByAsc(MerchantAuth::getReviewTime).page(DatabaseContextHolder.page(param.getPaging()));
         return DatabaseContextHolder.pagination(page, MerchantAuthCopier.INSTANCE::copying);
     }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -180,7 +180,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         Integer count = this.lambdaQuery()
                 .eq(Merchant::getName, param.getName())
                 .eq(Merchant::getStatus, MerchantStatus.ONLINE).count();
-        AssertUtils.available(count < 1, "商家名称已存在");
+//        AssertUtils.available(count < 1, "商家名称已存在");
         Long userId = SessionContextHolder.getId();
         // 判断商家名称是否存在
         Integer count1 = this.lambdaQuery()

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/NoticeServiceImpl.java

@@ -59,7 +59,7 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     public List<NoticeDTO> getNoticeList(String type){
         List<Notice> notices = this.lambdaQuery()
                 .eq(StringUtils.notEmpty(type),Notice::getSendObject,type)
-                .eq(Notice::getStatus,0)
+                .eq(Notice::getStatus,1)
                 .orderByAsc(Notice::getCreateTime)
                 .list();
         return NoticeCopier.INSTANCE.copying(notices);