From faae303cd25f90b1c732b6bc737ede8b8ab714a0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 16:56:28 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 6f19a35..86fd04c 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
@@ -5,6 +5,7 @@
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.text.SimpleDateFormat;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -12,6 +13,7 @@
import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +64,7 @@
* @date: 2021/09/16 16:14
*/
@Service
+@Slf4j
public class ConvenientMerchantServiceImpl extends ServiceImpl<ConvenientMerchantDAO, ConvenientMerchantDO> implements ConvenientMerchantService {
@Resource
@@ -80,6 +83,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addMerchant(ConvenientMerchantDTO convenientMerchantDTO) {
+ log.error("catTimeStamp开始执行addMerchant", Instant.now().toEpochMilli());
ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
ConvenientMerchantDO convenientMerchantDO = new ConvenientMerchantDO();
BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
@@ -99,6 +103,7 @@
});
}
}
+ log.error("catTimeStamp商家创建完成开始添加用户", Instant.now().toEpochMilli());
//添加user
R addUserResult = userService.addConvenientMerchantUser(convenientMerchantDTO);
if (R.isOk(addUserResult)) {
@@ -108,6 +113,7 @@
} else {
throw new ServiceException("406", addUserResult.getMsg());
}
+ log.error("catTimeStamp全部完成", Instant.now().toEpochMilli());
return R.ok();
}
@@ -191,7 +197,7 @@
R result = userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
int type = disableOrEnableConvenientMerchantDTO.getType().intValue();
if (type == 2) {
- this.baseMapper.batchUpdateBusinessStatus(convenientMerchantDOList, 2);
+ this.baseMapper.batchUpdateBusinessStatus(convenientMerchantDOList, 0);
}
if (R.isOk(result)) {
return R.ok();
@@ -252,12 +258,10 @@
SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
String moth = mothFormat.format(nowDate);
String day = dayFormat.format(nowDate);
- int consultationCount = convenientConsultationStatisticsDAO.selectCount(new QueryWrapper<ConvenientConsultationStatisticsDO>()
- .lambda().eq(ConvenientConsultationStatisticsDO::getMerchantId, merchantId));
+ int consultationCount = convenientConsultationStatisticsDAO.selectTotalConsultationVolume(merchantId);
int monthConsultationVolume = convenientConsultationStatisticsDAO.selectMonthConsultationVolume(merchantId, moth);
int dayConsultationVolume = convenientConsultationStatisticsDAO.selectDayConsultationVolume(merchantId, day);
- Integer viewCount = convenientViewStatisticsDAO.selectCount(new QueryWrapper<ConvenientViewStatisticsDO>()
- .lambda().eq(ConvenientViewStatisticsDO::getMerchantId, merchantId));
+ Integer viewCount = convenientViewStatisticsDAO.selectTotalViewNum(merchantId);
int monthViewNum = convenientViewStatisticsDAO.selectMonthViewNum(merchantId, moth);
int dayViewNum = convenientViewStatisticsDAO.selectDayViewNum(merchantId, day);
convenientMerchantVO.setConsultationVolume(consultationCount);
--
Gitblit v1.7.1