feat: 落地页搜索

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/EnterpriseDetailDTO.java

@@ -32,6 +32,10 @@ public class EnterpriseDetailDTO implements Serializable{
 	private int aclFlag = 1  ;
 	private int defaultFlag ;
 
+	private String conactsPhone;
+
+	private String customerPhone;
+
     public int getDefaultFlag() {
         return defaultFlag;
     }
@@ -138,6 +142,20 @@ public class EnterpriseDetailDTO implements Serializable{
 	public void setBrandName(String brandName) {
 		this.brandName = brandName;
 	}
-	
-	
+
+	public String getConactsPhone() {
+		return conactsPhone;
+	}
+
+	public void setConactsPhone(String conactsPhone) {
+		this.conactsPhone = conactsPhone;
+	}
+
+	public String getCustomerPhone() {
+		return customerPhone;
+	}
+
+	public void setCustomerPhone(String customerPhone) {
+		this.customerPhone = customerPhone;
+	}
 }

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/WxEnterpriseRelatedApiService.java

@@ -157,4 +157,12 @@ public interface WxEnterpriseRelatedApiService {
 	
 	public List<String> listStoreIdByName(String wxEnterpriseId, String enterpriseId , String storeName);
 
+	/**
+	 * 查询当前商户信息
+	 * @param wxEnterpriseId
+	 * @param enterpriseId
+	 * @return
+	 */
+	com.gic.api.base.commons.ServiceResponse<EnterpriseDetailDTO> queryEnterpriseDetail(String wxEnterpriseId, String enterpriseId);
+
 }

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -6,6 +6,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.authcenter.commons.dto.AuthcenterUserDetails;
 import com.gic.authcenter.commons.util.SessionContextUtil;
 import com.gic.commons.util.GlobalVar;
+import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.api.dto.EnterpriseAndUserDTO;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.PowerStoreGroupDTO;
@@ -17,6 +18,8 @@ import com.gic.haoban.app.customer.service.api.service.QywxTagSyncApiService;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.PageResult;
 import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
+import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.common.utils.UuidUtil;
@@ -643,4 +646,14 @@ public class EnterpriseController extends WebBaseController {
         }
     }
 
+    @RequestMapping(path = "/current/enterprise/info")
+    public RestResponse<?> queryCurrentInfo(){
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        com.gic.api.base.commons.ServiceResponse<EnterpriseDetailDTO> serviceResponse = wxEnterpriseRelatedApiService.queryEnterpriseDetail(loginUser.getWxEnterpriseId(), loginUser.getEnterpriseId());
+        if (serviceResponse.isSuccess()){
+            return RestResponse.successResult(serviceResponse.getResult());
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/hm/HmPageRelationBO.java

@@ -56,6 +56,8 @@ public class HmPageRelationBO implements Serializable {
      */
     private Integer status;
 
+    private Long relationId;
+
     public String getPageCode() {
         return pageCode;
     }
@@ -119,4 +121,12 @@ public class HmPageRelationBO implements Serializable {
     public void setReferCode(String referCode) {
         this.referCode = referCode;
     }
+
+    public Long getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Long relationId) {
+        this.relationId = relationId;
+    }
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WelcomeService.java

@@ -132,10 +132,10 @@ public interface WelcomeService {
      *
      * @param staffId
      * @param wxEnterpriseId
-     * @param referId        活码/链接 code
+     * @param state
      * @return
      */
-    WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String referId);
+    WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String state);
 
     /**
      * 删除欢迎语

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/WelcomeServiceImpl.java

 package com.gic.haoban.manage.service.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.common.utils.StringUtil;
+import com.gic.haoban.manage.api.dto.KeyDataDTO;
 import com.gic.haoban.manage.api.dto.welcome.dto.WelcomeRemoveCheckDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeQDTO;
 import com.gic.haoban.manage.api.enums.FriendSettingTypeEnum;
+import com.gic.haoban.manage.api.enums.KeyDataEnum;
 import com.gic.haoban.manage.api.enums.WelcomeMediaTypeEnum;
 import com.gic.haoban.manage.api.enums.WelcomeRelationStatusEnum;
 import com.gic.haoban.manage.api.enums.WelcomeSuitTypeEnum;
@@ -17,6 +21,7 @@ import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
 import com.gic.haoban.manage.service.pojo.bo.welcome.*;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeInfoQO;
 import com.gic.haoban.manage.service.pojo.qo.WelcomeRelationQO;
+import com.gic.haoban.manage.service.service.KeyDataService;
 import com.gic.haoban.manage.service.service.WelcomeService;
 import com.gic.haoban.manage.service.service.WelcomeSuitRangService;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
@@ -58,6 +63,8 @@ public class WelcomeServiceImpl implements WelcomeService {
     private TabMiniprogramSettingMapper miniprogramSettingMapper;
     @Autowired
     private WelcomeRelationService welcomeRelationService;
+    @Autowired
+    private KeyDataService keyDataService;
 
     private static final int WELCOME_LIMIT = 50;
     private static final int DEPARTMENT_NUM_LIMIT = 10000;
@@ -634,11 +641,30 @@ public class WelcomeServiceImpl implements WelcomeService {
     }
 
     @Override
-    public WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String referId) {
+    public WelcomeDetailBO getMatchWelcomeWithReferId(String staffId, String wxEnterpriseId, String state) {
         logger.info("[getMatchWelcomeWithReferId] staffId:{}, wxEnterpriseId:{}, referId:{}",
-                staffId, wxEnterpriseId, referId);
-        // 根据referId 查询 关联关系表
-        HmWelcomeRelationBO welcomeRelationBO = welcomeRelationService.queryWelcomeRelation(referId, WelcomeRelationStatusEnum.ENABLE.getCode());
+                staffId, wxEnterpriseId, state);
+        String referId = "";
+        if (StringUtils.startsWith(state, "HM")){
+            // 活码
+            // 根据referId 查询 关联关系表
+           referId = StringUtils.substring(state, 2);
+        }
+        if (StringUtils.startsWith(staffId, "DT")){
+            // 链接 key
+            KeyDataDTO keyData = keyDataService.getDataByKey(StringUtils.substring(state, 2), KeyDataEnum.DYNAMIC_HM, null);
+            if (keyData != null){
+                JSONObject jsonObject = JSONObject.parseObject(keyData.getData());
+                if (jsonObject != null){
+                    referId = jsonObject.get("ljid").toString();
+                }
+            }
+        }
+
+        if (StringUtils.isBlank(referId)){
+            return null;
+        }
+        HmWelcomeRelationBO welcomeRelationBO = welcomeRelationService.queryWelcomeRelation(state, WelcomeRelationStatusEnum.ENABLE.getCode());
         if (welcomeRelationBO == null){
             // 不存在
             return null;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.service.service.out.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
+import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.RightService;
@@ -15,7 +16,7 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.enterprise.api.service.StoreService;
 import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.base.api.common.ServiceResponse;
+import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.*;
@@ -675,4 +676,28 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
         }
         return this.storeRangeService.listStoreIdByName(wxEnterpriseId, enterpriseId,storeName);
     }
+
+    /**
+     * 查询当前商户信息
+     *
+     * @param wxEnterpriseId
+     * @param enterpriseId
+     * @return
+     */
+    @Override
+    public com.gic.api.base.commons.ServiceResponse<EnterpriseDetailDTO> queryEnterpriseDetail(String wxEnterpriseId, String enterpriseId) {
+
+        TabHaobanWxEnterpriseRelated oneByEnterpriseId = wxEnterpriseRelatedMapper.findOneByEnterpriseId(enterpriseId);
+        if (oneByEnterpriseId == null){
+            return com.gic.api.base.commons.ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode()+"", HaoBanErrCodeCommon.ERR_8.getMsg());
+        }
+        EnterpriseDetailDTO enterpriseDetailDTO = EntityUtil.changeEntity(EnterpriseDetailDTO.class, oneByEnterpriseId);
+        EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
+        if (enterprise == null){
+            return  com.gic.api.base.commons.ServiceResponse.failure(HaoBanErrCodeCommon.ERR_8.getCode()+"", HaoBanErrCodeCommon.ERR_8.getMsg());
+        }
+        enterpriseDetailDTO.setConactsPhone(enterpriseDetailDTO.getConactsPhone());
+        enterpriseDetailDTO.setCustomerPhone(enterpriseDetailDTO.getCustomerPhone());
+        return com.gic.api.base.commons.ServiceResponse.success(enterpriseDetailDTO);
+    }
 }

haoban-manage3-service/src/test/java/HmLinkTest.java

@@ -115,7 +115,7 @@ public class HmLinkTest {
 
     @Test
     public void test3() {
-        this.keyDataApiService.saveMobileData("112",10000L, "15999") ;
+        this.keyDataApiService.saveMobileData("112","10000", "15999") ;
 
         System.out.println(this.keyDataApiService.getDataByKey("679f17d8c2e940a28dc484689c0339db", KeyDataEnum.MOBILE));
     }

haoban-manage3-service/src/test/java/HmPageServiceTest.java

+import cn.hutool.core.thread.ConcurrencyTester;
+import cn.hutool.core.thread.ThreadUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
+import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
+import com.gic.haoban.manage.api.service.DealSyncOperationApiService;
+import com.gic.haoban.manage.api.service.MemberUnionidRelatedApiService;
+import com.gic.haoban.manage.api.service.StaffApiService;
+import com.gic.haoban.manage.api.service.StaffClerkRelationApiService;
+import com.gic.haoban.manage.api.service.hm.HmPageApiService;
+import com.gic.haoban.manage.service.pojo.qo.HmPageTemplateQO;
+import com.gic.haoban.manage.service.service.StaffService;
+import com.gic.haoban.manage.service.service.TestService;
+import com.gic.haoban.manage.service.service.hm.HmPageService;
+import com.gic.wechat.api.dto.qywx.DepartmentDTO;
+import com.gic.wechat.api.service.qywx.QywxDepartmentApiService;
+import com.gic.wechat.api.service.qywx.QywxUserApiService;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
+public class HmPageServiceTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(HmPageServiceTest.class);
+
+    @Autowired
+    private HmPageApiService pageService;
+
+    @Test
+    public void test(){
+        HmPageQDTO pageQDTO = new HmPageQDTO();
+        pageQDTO.setPageSearchText("MB01419872763172380673");
+        ServiceResponse<Page<HmPageDTO>> pageServiceResponse = pageService.queryPageList(pageQDTO);
+    }
+
+}