From a0f33f915dd4128d98111f67a3c75b1676adae32 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 11:20:39 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 2af73b7..e232775 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -1,5 +1,6 @@
package com.panzhihua.service_community.service.impl;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -124,7 +125,7 @@
if (isNull(convenientMerchantDO)) {
return R.fail("商家不存在");
}
- if (nonNull(merchantDO)&&!merchantDO.getId().equals(convenientMerchantDO.getId())) {
+ if (nonNull(merchantDO) && !merchantDO.getId().equals(convenientMerchantDO.getId())) {
R.fail("该微信手机号:" + mobilePhone + "已被使用！请更换");
}
Long communityId = convenientMerchantDTO.getCommunityId();
@@ -189,7 +190,7 @@
@Override
public R getMerchant(Long merchantId) {
ConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantById(merchantId);
- List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
+ List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
convenientMerchantVO.setServiceIds(serviceIds);
return R.ok(convenientMerchantVO);
}
@@ -225,7 +226,7 @@
@Override
public R<ConvenientMerchantVO> getUserMerchantInfoByAccount(String account) {
try {
- R<LoginUserInfoVO> loginUserInfoVOR = userService.getUserInfo(account + "_10");
+ R<LoginUserInfoVO> loginUserInfoVOR = userService.getUserInfo(account + "_5");
LoginUserInfoVO loginUserInfoVO =
JSONObject.parseObject(JSONObject.toJSONString(loginUserInfoVOR.getData()), LoginUserInfoVO.class);
@@ -248,6 +249,20 @@
}
@Override
+ public R<ConvenientMerchantVO> getMerchantInfoByAccount(String account) {
+ try {
+ List<ConvenientMerchantVO> merchantDetailByAccount = this.baseMapper.getMerchantDetailByAccount(account);
+ if (CollUtil.isEmpty(merchantDetailByAccount)) {
+ return R.fail(500, "该账号不存在");
+ }
+ ConvenientMerchantVO convenientMerchantVO = merchantDetailByAccount.get(0);
+ return R.ok(convenientMerchantVO);
+ } catch (Exception e) {
+ return R.fail();
+ }
+ }
+
+ @Override
public R<ConvenientMerchantVO> getUserConvenientMerchantInfo(Long userId) {
ConvenientMerchantDO merchantDO = this.baseMapper.selectOne(new QueryWrapper<ConvenientMerchantDO>()
.lambda().eq(ConvenientMerchantDO::getUserId, userId));
@@ -257,7 +272,7 @@
Long merchantId = merchantDO.getId();
ConvenientMerchantVO convenientMerchantVO = new ConvenientMerchantVO();
BeanUtils.copyProperties(merchantDO, convenientMerchantVO);
- List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
+ List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
convenientMerchantVO.setServiceIds(serviceIds);
Date nowDate = new Date();
SimpleDateFormat mothFormat = new SimpleDateFormat("yyyy-MM");
@@ -465,12 +480,31 @@
@Override
public R getMerchantByUserId(Long userId) {
ConvenientMerchantVO convenientMerchantVO = this.baseMapper.selectMerchantByUserId(userId);
- if (nonNull(convenientMerchantVO)) {
- List<Long> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(convenientMerchantVO.getId());
- convenientMerchantVO.setServiceIds(serviceIds);
+ if (isNull(convenientMerchantVO)) {
+ return R.fail("商家不存在");
}
- BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(convenientMerchantVO.getId());
+ Long merchantId = convenientMerchantVO.getId();
+ List<String> serviceIds = convenientServiceCategoryDAO.selectServiceIdsForMerchant(merchantId);
+ convenientMerchantVO.setServiceIds(serviceIds);
+ BigDecimal score = comShopFlowerEvaluateDAO.statisticsScore(merchantId);
convenientMerchantVO.setScore(null == score ? BigDecimal.ZERO : NumberUtil.round(score, 1));
+ Date nowDate = new Date();
+ SimpleDateFormat mothFormat = new SimpleDateFormat("yyyy-MM");
+ SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String moth = mothFormat.format(nowDate);
+ String day = dayFormat.format(nowDate);
+ int consultationCount = convenientConsultationStatisticsDAO.selectTotalConsultationVolume(merchantId);
+ int monthConsultationVolume = convenientConsultationStatisticsDAO.selectMonthConsultationVolume(merchantId, moth);
+ int dayConsultationVolume = convenientConsultationStatisticsDAO.selectDayConsultationVolume(merchantId, day);
+ Integer viewCount = convenientViewStatisticsDAO.selectTotalViewNum(merchantId);
+ int monthViewNum = convenientViewStatisticsDAO.selectMonthViewNum(merchantId, moth);
+ int dayViewNum = convenientViewStatisticsDAO.selectDayViewNum(merchantId, day);
+ convenientMerchantVO.setConsultationVolume(consultationCount);
+ convenientMerchantVO.setViewNum(viewCount);
+ convenientMerchantVO.setMonthConsultationVolume(monthConsultationVolume);
+ convenientMerchantVO.setDayConsultationVolume(dayConsultationVolume);
+ convenientMerchantVO.setMonthViewNum(monthViewNum);
+ convenientMerchantVO.setDayViewNum(dayViewNum);
return R.ok(convenientMerchantVO);
}
}
--
Gitblit v1.7.1