From 4daaeb419439404a33c92f7ef1b6ee965981a41b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 13:40:32 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java
index 55bb490..b5bc5f5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ConvenientMerchantService.java
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
@@ -77,6 +79,13 @@
R<ConvenientMerchantVO> getUserMerchantInfoByAccount(String account);
/**
+ * 获取用户便民服务商家详情
+ * @param account 商家绑定账号
+ * @return
+ */
+ R<ConvenientMerchantVO> getMerchantInfoByAccount(String account);
+
+ /**
* 获取商便民服务商家信息
* @param userId
* @return
@@ -103,4 +112,52 @@
* @return
*/
R getMerchantDetail(Long merchantId);
+
+ /**
+ * 搜索商家信息
+ * @param pageSearchDTO
+ * @return
+ */
+ R pageSearchMerchant(PageSearchDTO pageSearchDTO);
+
+ /**
+ * 增加商家店铺咨询量
+ * @param merchantId
+ * @return
+ */
+ R consultMerchant(Long merchantId);
+
+ /**
+ * 增加商家店铺浏览量
+ * @param merchantId
+ * @return
+ */
+ R incrMerchantView(Long merchantId);
+
+ /**
+ * 获取商家导出数据
+ * @param exportMerchantDTO
+ * @return
+ */
+ R exportMerchant(ExportMerchantDTO exportMerchantDTO);
+
+ /**
+ * 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
+ * @return
+ */
+ R timedTaskWriteDataToMerchantJobHandler();
+
+ /**
+ * check商家/店铺是否有效
+ * @param userId
+ * @return
+ */
+ Boolean checkStoreIsValid(Long userId);
+
+ /**
+ * 根据后台用户id查询
+ * @param userId
+ * @return
+ */
+ R getMerchantByUserId(Long userId);
}
--
Gitblit v1.7.1