展商邀请

src/main/java/net/mingsoft/tf/biz/IExhibitorBiz.java

@@ -3,6 +3,8 @@ package net.mingsoft.tf.biz;
 import net.mingsoft.base.biz.IBaseBiz;
 import net.mingsoft.tf.entity.ExhibitorEntity;
 
+import java.util.List;
+
 /**
  * 展商业务
  *
@@ -33,4 +35,11 @@ public interface IExhibitorBiz extends IBaseBiz<ExhibitorEntity> {
      * @param invitationCode 邀请码
      */
     ExhibitorEntity queryByInvitationCode(String invitationCode);
+
+    /**
+     * 根据公司模糊搜索
+     * <p>
+     * 搜索用户ID和展会ID为空的
+     */
+    List<ExhibitorEntity> queryByName(String name);
 }

src/main/java/net/mingsoft/tf/biz/impl/ExhibitorBizImpl.java

@@ -10,6 +10,7 @@ import net.mingsoft.tf.entity.ExhibitorEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.function.Function;
 
 /**
@@ -63,4 +64,13 @@ public class ExhibitorBizImpl extends BaseBizImpl<IExhibitorDao, ExhibitorEntity
     public ExhibitorEntity queryByInvitationCode(String invitationCode) {
         return exhibitorDao.selectOne(new LambdaQueryWrapper<>(ExhibitorEntity.class).eq(ExhibitorEntity::getExhibitorCode, invitationCode));
     }
+
+    @Override
+    public List<ExhibitorEntity> queryByName(String name) {
+        return exhibitorDao.selectList(new LambdaQueryWrapper<>(ExhibitorEntity.class)
+                .like(ExhibitorEntity::getExhibitorName, name)
+                .isNull(ExhibitorEntity::getExhibitorUser)
+                .isNull(ExhibitorEntity::getExhibitorActivities)
+        );
+    }
 }

src/main/java/net/mingsoft/tf/wx/ExhibitorAction.java

@@ -1,6 +1,6 @@
 package net.mingsoft.tf.wx;
 
-import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
@@ -18,7 +18,6 @@ import net.mingsoft.tf.biz.IExhibitionBiz;
 import net.mingsoft.tf.biz.IExhibitorBiz;
 import net.mingsoft.tf.biz.IPeopleExhibitorBiz;
 import net.mingsoft.tf.biz.impl.ExhibitorBizImpl;
-import net.mingsoft.tf.entity.BoothEntity;
 import net.mingsoft.tf.entity.ExhibitionEntity;
 import net.mingsoft.tf.entity.ExhibitorEntity;
 import net.mingsoft.tf.wx.dto.ExhibitorInfoResponse;
@@ -29,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -104,6 +104,22 @@ public class ExhibitorAction extends BaseAction {
     }
 
     @Operation(summary = "微信-展商-申请")
+    @GetMapping(value = "/exhibitor/query")
+    @ResponseBody
+    public ResultData exhibitorQuery(String name) {
+        return ResultData.build().success(Optional.ofNullable(name)
+                .filter(StrUtil::isNotBlank)
+                .stream()
+                .map(exhibitorBiz::queryByName)
+                .flatMap(Collection::stream)
+                .peek(item -> {
+                    item.setExhibitorContact(null);
+                    item.setExhibitorPhone(null);
+                })
+                .toList());
+    }
+
+    @Operation(summary = "微信-展商-申请")
     @PostMapping(value = "/exhibitor/create")
     @ResponseBody
     public ResultData exhibitorCreate(@RequestBody ExhibitorEntity exhibitor) {
@@ -115,14 +131,15 @@ public class ExhibitorAction extends BaseAction {
         if (exhibitorBiz.query(userId, exhibition.getId()) != null) {
             return ResultData.build().error("已经申请，不需重新申请");
         }
-        BoothEntity booth = new BoothEntity();
-        booth.setBoothCode(exhibitor.getExhibitorBooth());
-        if (CollUtil.isEmpty(boothBiz.query(booth))) {
-            return ResultData.build().error("展位不存在");
-        }
-        if (exhibitorBiz.queryByBooth(userId, exhibition.getId()) != null) {
-            return ResultData.build().error("展位已被申请");
-        }
+        // BoothEntity booth = new BoothEntity();
+        // booth.setBoothCode(exhibitor.getExhibitorBooth());
+        // if (CollUtil.isEmpty(boothBiz.query(booth))) {
+        //     return ResultData.build().error("展位不存在");
+        // }
+        // if (exhibitorBiz.queryByBooth(userId, exhibition.getId()) != null) {
+        //     return ResultData.build().error("展位已被申请");
+        // }
+        exhibitor.setId(null);
         exhibitor.setExhibitorUser(userId);
         exhibitor.setExhibitorActivities(exhibition.getId());
         exhibitor.setExhibitorCode(ExhibitorBizImpl.createInvitationCode(exhibitorBiz::queryByInvitationCode));

src/main/webapp/WEB-INF/manager/index.ftl

@@ -28,7 +28,7 @@
                          text-color="rgba(255,255,255,1)" active-text-color="rgba(255,255,255,1)"
                          :collapse="collapseMenu" :unique-opened='true' ref='menu'>
                     <div class="ms-admin-logo" :style="{display: 'flex','padding-left': (collapseMenu?'5px':'22px')}">
-                        LOGO  图片
+                        <img :src="ms.base+'/static/logo.png'"/>
                     </div>
                     <template v-for="(menu,i) in asideMenuList" :key='i'>
 
@@ -510,7 +510,7 @@
 
     .ms-admin-logo img {
         padding: 14px 0;
-        width: 50px;
+        width: 120px;
     }
 
     .ms-admin-logo>div {