From 4e8be752d24ae22362455c16f75d3bcbccb23359 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 15:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
index 3d7c2d5..1823d55 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -34,8 +34,9 @@
/**
* 查询店铺列表
- * @param pageComShopStoreDTO 请求参数
- * @return 店铺列表
+ *
+ * @param pageComShopStoreDTO 请求参数
+ * @return 店铺列表
*/
@Override
@@ -47,18 +48,19 @@
/**
* 查询店铺详情
- * @param comShopStoreDTO 请求参数
- * @return 店铺详情
+ *
+ * @param comShopStoreDTO 请求参数
+ * @return 店铺详情
*/
@Override
public R shopStoreDetail(PageComShopStoreDTO comShopStoreDTO) {
//查询店铺
ComShopStoreDO storeDO = this.baseMapper.selectById(comShopStoreDTO.getStoreId());
if (storeDO == null) {
- return R.fail(401,"店铺不存在");
+ return R.fail(401, "店铺不存在");
}
- if(storeDO.getStatus().equals(ComShopStoreDO.status.no)){
- return R.fail(402,"店铺已被禁用");
+ if (storeDO.getStatus().equals(ComShopStoreDO.status.no)) {
+ return R.fail(402, "店铺已被禁用");
}
PageShopStoreVO shopStoreVO = new PageShopStoreVO();
BeanUtils.copyProperties(storeDO, shopStoreVO);
@@ -75,6 +77,11 @@
public R saveStore(ShopStoreVO storeVO) {
if (storeVO == null) {
return R.ok("500", "数据为空！");
+ }
+ ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>()
+ .eq(ComShopStoreDO::getStoreAccount, storeVO.getStoreAccount()));
+ if (comShopStoreDO != null) {
+ return R.ok("500", "商家账号存在");
}
ComShopStoreDO storeDO = new ComShopStoreDO();
BeanUtils.copyProperties(storeVO, storeDO);
@@ -108,10 +115,10 @@
public R getOneInfo(Long id) {
ComShopStoreDO comShopStoreDO = this.baseMapper.selectById(id);
if (comShopStoreDO == null) {
- R.fail(500,"商铺不存在");
+ R.fail(500, "商铺不存在");
}
ShopStoreVO shopStoreVO = new ShopStoreVO();
- BeanUtils.copyProperties(comShopStoreDO,shopStoreVO);
+ BeanUtils.copyProperties(comShopStoreDO, shopStoreVO);
return R.ok(shopStoreVO);
}
@@ -119,10 +126,10 @@
public R getUserStoreInfo(Long userId) {
ComShopStoreDO comShopStoreDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ComShopStoreDO>().eq(ComShopStoreDO::getDeleteStatus, 1).eq(ComShopStoreDO::getSysUserId, userId));
if (comShopStoreDO == null) {
- R.fail(500,"商铺不存在");
+ R.fail(500, "商铺不存在");
}
ShopStoreVO shopStoreVO = new ShopStoreVO();
- BeanUtils.copyProperties(comShopStoreDO,shopStoreVO);
+ BeanUtils.copyProperties(comShopStoreDO, shopStoreVO);
return R.ok(shopStoreVO);
}
}
--
Gitblit v1.7.1