From 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 17:59:03 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
index 287240b..6ca64de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
@@ -6,6 +6,7 @@
import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Random;
@@ -80,6 +81,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R addMcsMerchant(McsMerchantDTO mcsMerchantDTO) {
+ McsMerchant existMerchant = this.baseMapper.selectOne(new QueryWrapper<McsMerchant>().lambda().eq(McsMerchant::getPhone, mcsMerchantDTO.getPhone()));
+ if (nonNull(existMerchant)) {
+ if (existMerchant.getIsDel()) {
+ this.baseMapper.deleteById(existMerchant.getId());
+ } else {
+ return R.fail("手机号已存在");
+ }
+ }
McsMerchant mcsMerchant = new McsMerchant();
BeanUtils.copyProperties(mcsMerchantDTO, mcsMerchant);
Integer litDays = mcsMerchantDTO.getLitDays();
@@ -253,7 +262,7 @@
if (R.isOk(userInfoVOR) && nonNull(userInfoVOR.getData())) {
LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(JSONObject.toJSONString(userInfoVOR.getData()), LoginUserInfoVO.class);
mcsMerchant = new McsMerchant();
- mcsMerchant.setName(isBlank(merchantName) ? "默认名称" : merchantName);
+ mcsMerchant.setName(isBlank(merchantName) ? loginUserInfoVO.getName() : merchantName);
mcsMerchant.setPhone(loginUserInfoVO.getPhone());
mcsMerchant.setAccount(loginUserInfoVO.getAccount());
mcsMerchant.setLevel(1);
@@ -265,6 +274,9 @@
mcsMerchant.setCreatedBy(userId);
mcsMerchant.setUpdatedBy(userId);
num = this.baseMapper.insert(mcsMerchant);
+ McsMerchantDTO mcsMerchantDTO = new McsMerchantDTO();
+ mcsMerchantDTO.setName(mcsMerchant.getName());
+ userService.putMcsMerchantUser(mcsMerchantDTO);
} else {
return R.fail("获取用户信息失败");
}
@@ -430,7 +442,7 @@
Integer idleTotal = publishLimit - publishCount;
merchantVO.setIdleTotal(idleTotal > 0 ? idleTotal : 0);
if (nonNull(merchantVO.getExpireAt())) {
- int surplusLitDays = DateUtils.differentDays(new Date(), merchantVO.getExpireAt());
+ int surplusLitDays = DateUtils.retrieveRemainingDays(merchantVO.getExpireAt());
merchantVO.setSurplusLitDays(surplusLitDays > 0 ? surplusLitDays : 0);
}
}
--
Gitblit v1.7.1