From 5a8a90c095280fbd2106869ecd2bad10e01a57a6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 十二月 2021 18:10:22 +0800
Subject: [PATCH] 12/23 大屏修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 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 86fd04c..2f8779f 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,7 +5,6 @@
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;
@@ -13,7 +12,6 @@
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;
@@ -56,6 +54,8 @@
import com.panzhihua.service_community.model.dos.ConvenientViewStatisticsDO;
import com.panzhihua.service_community.service.ConvenientMerchantService;
+import lombok.extern.slf4j.Slf4j;
+
/**
* @title: ConvenientMerchantServiceImpl
* @projectName: 成都呐喊信息技术有限公司-智慧社区项目
@@ -83,12 +83,16 @@
@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);
+ if(convenientMerchantDTO.getCommunityId()==0){
+ convenientMerchantDO.setCommunityName("西区社区");
+ }
+ else {
+ ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
+ convenientMerchantDO.setCommunityName(comActDO.getName());
+ }
convenientMerchantDO.setUserId(0L);
- convenientMerchantDO.setCommunityName(comActDO.getName());
convenientMerchantDO.setCreatedAt(new Date());
int insertResult = this.baseMapper.insert(convenientMerchantDO);
if (insertResult > 0) {
@@ -103,7 +107,6 @@
});
}
}
- log.error("catTimeStamp商家创建完成开始添加用户", Instant.now().toEpochMilli());
//添加user
R addUserResult = userService.addConvenientMerchantUser(convenientMerchantDTO);
if (R.isOk(addUserResult)) {
@@ -113,7 +116,6 @@
} else {
throw new ServiceException("406", addUserResult.getMsg());
}
- log.error("catTimeStamp全部完成", Instant.now().toEpochMilli());
return R.ok();
}
@@ -128,7 +130,12 @@
Long communityId = convenientMerchantDTO.getCommunityId();
if (nonNull(communityId)) {
ComActDO comActDO = comActDAO.selectById(communityId);
- convenientMerchantDO.setCommunityName(comActDO.getName());
+ if(comActDO!=null){
+ convenientMerchantDO.setCommunityName(comActDO.getName());
+ }
+ else {
+ convenientMerchantDO.setCommunityName("西区社区");
+ }
}
String account = convenientMerchantDTO.getAccount();
if (isNotBlank(account)) {
@@ -282,6 +289,15 @@
page.setSize(pagePopularMerchantDTO.getPageSize());
page.setCurrent(pagePopularMerchantDTO.getPageNum());
IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon);
+ if(pagePopularMerchantDTO.getPageNum().equals(1L)){
+ //第一页默认把犇师傅维修中心加载到第一个
+ List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon);
+ if(merchantList != null && merchantList.size() > 0){
+ merchantList.addAll(merchantVOList.getRecords());
+ merchantVOList.setRecords(merchantList);
+ }
+
+ }
return R.ok(merchantVOList);
}
--
Gitblit v1.7.1