From d7a8baeff8b0e68c54a959e5f46f639c54aad1d1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 17:15:29 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 f9576b7..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,13 +5,15 @@
 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;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
-import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +41,7 @@
 import com.panzhihua.common.model.vos.community.convenient.ConvenientProductSpecificationVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientProductVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
+import com.panzhihua.common.model.vos.community.convenient.ExportMerchantVO;
 import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.service_community.dao.ComActDAO;
 import com.panzhihua.service_community.dao.ConvenientConsultationStatisticsDAO;
@@ -61,6 +64,7 @@
  * @date: 2021/09/16 16:14
  */
 @Service
+@Slf4j
 public class ConvenientMerchantServiceImpl extends ServiceImpl<ConvenientMerchantDAO, ConvenientMerchantDO> implements ConvenientMerchantService {
 
     @Resource
@@ -79,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);
@@ -98,6 +103,7 @@
                 });
             }
         }
+        log.error("catTimeStamp商家创建完成开始添加用户", Instant.now().toEpochMilli());
         //添加user
         R addUserResult = userService.addConvenientMerchantUser(convenientMerchantDTO);
         if (R.isOk(addUserResult)) {
@@ -107,6 +113,7 @@
         } else {
             throw new ServiceException("406", addUserResult.getMsg());
         }
+        log.error("catTimeStamp全部完成", Instant.now().toEpochMilli());
         return R.ok();
     }
 
@@ -141,6 +148,7 @@
             });
         }
         BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
+        convenientMerchantDO.setIntroduction(convenientMerchantDTO.getIntroduction());
         this.baseMapper.updateById(convenientMerchantDO);
         return R.ok();
     }
@@ -182,7 +190,15 @@
 
     @Override
     public R disableOrEnableMerchant(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
+        List<ConvenientMerchantDO> convenientMerchantDOList = this.baseMapper.selectList(new QueryWrapper<ConvenientMerchantDO>()
+                .lambda().in(ConvenientMerchantDO::getId, disableOrEnableConvenientMerchantDTO.getIds()));
+        List<Long> userIds = convenientMerchantDOList.stream().map(ConvenientMerchantDO::getUserId).collect(Collectors.toList());
+        disableOrEnableConvenientMerchantDTO.setUserIds(userIds);
         R result = userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
+        int type = disableOrEnableConvenientMerchantDTO.getType().intValue();
+        if (type == 2) {
+            this.baseMapper.batchUpdateBusinessStatus(convenientMerchantDOList, 0);
+        }
         if (R.isOk(result)) {
             return R.ok();
         }
@@ -191,9 +207,12 @@
 
     @Override
     public R resetPasswordMerchant(ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO) {
+        List<ConvenientMerchantDO> convenientMerchantDOList = this.baseMapper.selectList(new QueryWrapper<ConvenientMerchantDO>()
+                .lambda().in(ConvenientMerchantDO::getId, resetPasswordConvenientMerchantDTO.getIds()));
+        List<Long> userIds = convenientMerchantDOList.stream().map(ConvenientMerchantDO::getUserId).collect(Collectors.toList());
         EventGridMemberPassResetDTO eventGridMemberPassResetDTO = new EventGridMemberPassResetDTO();
         eventGridMemberPassResetDTO.setPassword(resetPasswordConvenientMerchantDTO.getPassword());
-        eventGridMemberPassResetDTO.setIds(resetPasswordConvenientMerchantDTO.getIds());
+        eventGridMemberPassResetDTO.setIds(userIds);
         return userService.gridMemberPassReset(eventGridMemberPassResetDTO);
     }
 
@@ -239,10 +258,14 @@
         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);

--
Gitblit v1.7.1