From b84a8a3de5719b5368ce5d6c3b93a2d5f68f9f3c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 16 八月 2022 14:26:07 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 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 6c9aa04..ce08649 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
@@ -12,6 +12,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.utlis.Snowflake;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -80,13 +81,22 @@
@Resource
private ConvenientViewStatisticsDAO convenientViewStatisticsDAO;
+ private static final String DQ="510402";
+ private static final String RHQ="510411";
+
@Override
@Transactional(rollbackFor = Exception.class)
public R addMerchant(ConvenientMerchantDTO convenientMerchantDTO) {
ConvenientMerchantDO convenientMerchantDO = new ConvenientMerchantDO();
BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
if(convenientMerchantDTO.getCommunityId()==0){
- convenientMerchantDO.setCommunityName("西区社区");
+ if(DQ.equals(convenientMerchantDTO.getAreaCode())){
+ convenientMerchantDO.setCommunityName("东区社区");
+ }else if(RHQ.equals(convenientMerchantDTO.getAreaCode())){
+ convenientMerchantDO.setCommunityName("仁和区社区");
+ }else{
+ convenientMerchantDO.setCommunityName("西区社区");
+ }
}
else {
ComActDO comActDO = comActDAO.selectById(convenientMerchantDTO.getCommunityId());
@@ -102,7 +112,7 @@
List<Long> serviceIds = convenientMerchantDTO.getServiceIds();
serviceIds.forEach(serviceId -> {
ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
- convenientServiceCategoryDAO.createMerchantServiceRelation(merchantId, serviceId,
+ convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(),merchantId, serviceId,
convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
});
}
@@ -110,7 +120,7 @@
//添加user
R addUserResult = userService.addConvenientMerchantUser(convenientMerchantDTO);
if (R.isOk(addUserResult)) {
- Long merchantUserId = ((Integer) addUserResult.getData()).longValue();
+ Long merchantUserId = Long.parseLong(addUserResult.getData().toString());
convenientMerchantDO.setUserId(merchantUserId);
this.baseMapper.updateById(convenientMerchantDO);
} else {
@@ -150,7 +160,7 @@
convenientServiceCategoryDAO.deleteMerchantServiceRelation(merchantId);
serviceIds.forEach(serviceId -> {
ConvenientServiceCategoryDO convenientServiceCategoryDO = convenientServiceCategoryDAO.selectById(serviceId);
- convenientServiceCategoryDAO.createMerchantServiceRelation(merchantId, serviceId,
+ convenientServiceCategoryDAO.createMerchantServiceRelation(Snowflake.getId(),merchantId, serviceId,
convenientServiceCategoryDO.getName(), convenientMerchantDTO.getCreatedBy());
});
}
@@ -288,7 +298,7 @@
Page page = new Page<>();
page.setSize(pagePopularMerchantDTO.getPageSize());
page.setCurrent(pagePopularMerchantDTO.getPageNum());
- IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon);
+ IPage<ConvenientMerchantVO> merchantVOList = this.baseMapper.getPopularMerchants(page, pagePopularMerchantDTO.getCommunityId(), currentMon,pagePopularMerchantDTO.getAreaCode());
if(pagePopularMerchantDTO.getPageNum().equals(1L)){
//第一页默认把犇师傅维修中心加载到第一个
List<ConvenientMerchantVO> merchantList = this.baseMapper.selectMerchantByName(pagePopularMerchantDTO.getCommunityId(), currentMon);
--
Gitblit v1.7.1