From 55402cc48ecee2ac135624db4d31119b459a1be7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 15:59:51 +0800
Subject: [PATCH] 商业街bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsInformationMapper.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 8 +++++++-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java | 8 ++++++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 4 ++--
4 files changed, 18 insertions(+), 4 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 0935a9e..3d20c0a 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
@@ -80,6 +80,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();
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
index 8b15e42..3624ae3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
@@ -27,6 +27,8 @@
import java.math.BigDecimal;
import java.util.Date;
+import static java.util.Objects.nonNull;
+
/**
* 商业街订单表(McsOrder)表服务实现类
*
@@ -131,7 +133,11 @@
mcsOrderBase.setPayTime(mcsOrderVO.getPayTime());
int i=this.baseMapper.updateById(mcsOrderBase);
if(i>0){
- mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getMerchantName(),mcsOrderBase.getConfigId(),mcsOrderBase.getUserId());
+ R r = mcsMerchantService.updateOrAddMcsMerchantAfterOrder(mcsOrderBase.getMerchantName(), mcsOrderBase.getConfigId(), mcsOrderBase.getUserId());
+ if (R.isOk(r) && nonNull(r.getData())) {
+ mcsOrderBase.setMerchantId(JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Long.class));
+ this.baseMapper.updateById(mcsOrderBase);
+ }
}
return R.ok();
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsInformationMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsInformationMapper.xml
index 6d4f602..9b9afb2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsInformationMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/McsInformationMapper.xml
@@ -55,7 +55,7 @@
</update>
<select id="pageMcsInfo"
resultType="com.panzhihua.common.model.vos.community.microCommercialStreet.McsInformationVO">
- SELECT t1.id, t1.`name`, t1.publish_at, t1.`status`, t1.merchant_id, t2.`name` AS merchantName
+ SELECT t1.id, t1.`name`, t1.publish_at, t1.`status`, t1.merchant_id, t2.`name` AS merchantName, t1.cover
FROM mcs_information t1
LEFT JOIN mcs_merchant t2 ON t1.merchant_id = t2.id
WHERE t1.is_del = 0
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 7018d27..82d2a14 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2822,7 +2822,7 @@
public R addMcsMerchantUser(McsMerchantDTO mcsMerchantDTO) {
SysUserDO sysUserDO;
sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda()
- .eq(SysUserDO::getAccount, mcsMerchantDTO.getAccount()).eq(SysUserDO::getType, 11));
+ .eq(SysUserDO::getPhone, mcsMerchantDTO.getPhone()).eq(SysUserDO::getType, 11));
String encode = new BCryptPasswordEncoder().encode(mcsMerchantDTO.getPassword());
if (nonNull(sysUserDO)) {
BeanUtils.copyProperties(mcsMerchantDTO, sysUserDO);
@@ -2987,7 +2987,7 @@
public R getMcsUserByOpenId(String openid) {
SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getOpenid, openid).eq(SysUserDO::getType, 11));
McsLoginUserInfoVO loginUserInfoVO = null;
- if (nonNull(sysUserDO)) {
+ if (nonNull(sysUserDO) && isNotBlank(sysUserDO.getOpenid())) {
loginUserInfoVO = new McsLoginUserInfoVO();
BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
}
--
Gitblit v1.7.1