From 77723a7720dab6bebc8b6c6af963df205e4dba7c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 16:17:40 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 74 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index 25187af..ce41987 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -1,11 +1,13 @@
package com.ruoyi.shop.service.impl.shop;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
@@ -13,27 +15,28 @@
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
import com.ruoyi.shop.service.task.ShopFileService;
-import com.ruoyi.shop.util.CodeFactoryUtil;
+import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.poji.config.SysTag;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
+import com.ruoyi.system.api.domain.poji.sys.SysUser;
+import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
import com.ruoyi.system.api.service.RemoteConfigService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteOrderService;
import com.ruoyi.system.api.service.RemoteUserService;
-import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
-import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.config.SysTag;
-import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.poji.sys.SysUser;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
-import com.ruoyi.common.core.utils.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.StringJoiner;
/**
@@ -83,6 +86,10 @@
@Resource
private ShopAuthenticationService shopAuthenticationService;
+ @Resource
+ private ShopProportionService shopProportionService;
+
+
/**
* 获取商户详情
@@ -121,16 +128,20 @@
/**
* 创建商户
- * @param MGTEditShopDto
+ * @param mgtEditShopDto
*/
@Override
- public void createShop(MgtEditShopDto MGTEditShopDto){
+ public void createShop(MgtEditShopDto mgtEditShopDto){
Shop shop = new Shop();
Boolean newShop = false;
- if(MGTEditShopDto.getShopId()!=null){
- shop = this.getById(MGTEditShopDto.getShopId());
+ Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
+ if(mgtEditShopDto.getShopId()!=null){
+ if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
+ throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
+ }
+ shop = this.getById(mgtEditShopDto.getShopId());
shop.setUpdateTime(new Date());
- shop.setUpdateUserId(MGTEditShopDto.getUserId());
+ shop.setUpdateUserId(mgtEditShopDto.getUserId());
shop.setShopTags(null);
//清空关联记录
shopFileService.deleteByShopId(shop.getShopId());
@@ -140,22 +151,25 @@
shopRelUserService.deleteByShopId(shop.getShopId());
shopStaffService.clearShopStaffRelation(shop.getShopId());
}else{
+ if(shopSame!=null){
+ throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
+ }
shop.setShopStatus(3);
shop.setCreateTime(new Date());
- shop.setCreateUserId(MGTEditShopDto.getUserId());
+ shop.setCreateUserId(mgtEditShopDto.getUserId());
shop.setFrozenFlag(0);
shop.setCooperativeFlag(0);
newShop = true;
}
- BeanUtils.copyProperties(MGTEditShopDto,shop);
+ BeanUtils.copyProperties(mgtEditShopDto,shop);
this.saveOrUpdate(shop);
//商户编号
- if(MGTEditShopDto.getShopId()==null){
+ if(mgtEditShopDto.getShopId()==null){
String shopNo = CodeFactoryUtil.getShopNo(shop.getShopId());
shop.setShopNumber(shopNo);
}
//商户标签
- String shopTagIds = MGTEditShopDto.getShopTagIds();
+ String shopTagIds = mgtEditShopDto.getShopTagIds();
if(StringUtils.isNotBlank(shopTagIds)){
String[] shopTagIdArray = shopTagIds.split(",");
ShopRelTag shopRelTag;
@@ -179,7 +193,7 @@
SysUser belongSysUser = sysUserService.getSysUser(shop.getBelongUserId()).getData();
handleShopStaff(shop.getShopId(),belongSysUser);
//商户关联人员
- String relUserIds = MGTEditShopDto.getRelUserIds();
+ String relUserIds = mgtEditShopDto.getRelUserIds();
if(StringUtils.isNotBlank(relUserIds)){
String[] relUserIdArray = relUserIds.split(",");
ShopRelUser shopRelUser;
@@ -203,12 +217,12 @@
ShopFile shopFile = new ShopFile();
shopFile.setDelFlag(0);
shopFile.setFileType(1);
- shopFile.setFileUrl(MGTEditShopDto.getShopPicture());
+ shopFile.setFileUrl(mgtEditShopDto.getShopPicture());
shopFile.setShopId(shop.getShopId());
shopFileService.save(shopFile);
//商户banner
- if(StringUtils.isNotBlank(MGTEditShopDto.getShopBanners())){
- String shopBanners= MGTEditShopDto.getShopBanners();
+ if(StringUtils.isNotBlank(mgtEditShopDto.getShopBanners())){
+ String shopBanners= mgtEditShopDto.getShopBanners();
String[] shopBannerArray = shopBanners.split(",");
for(String str : shopBannerArray){
shopFile = new ShopFile();
@@ -220,6 +234,7 @@
}
}
if(newShop){
+ //商户账户信息初始化
ShopAccount shopAccount = new ShopAccount();
shopAccount.setShopId(shop.getShopId());
shopAccount.setDelFlag(0);
@@ -228,13 +243,23 @@
shopAccount.setTotalRefund(new BigDecimal("0"));
shopAccount.setTotalProfitsharing(new BigDecimal("0"));
shopAccount.setTotalMoney(new BigDecimal("0"));
- shopAccountService.saveOrUpdate(shopAccount);
+ shopAccountService.save(shopAccount);
+ //商户认证信息初始化
String authId = IdUtils.simpleUUID();
ShopAuthentication shopAuthentication = new ShopAuthentication();
shopAuthentication.setAuthId(authId);
shopAuthentication.setDelFlag(0);
shopAuthentication.setShopId(shop.getShopId());
- shopAuthenticationService.saveOrUpdate(shopAuthentication);
+ shopAuthenticationService.save(shopAuthentication);
+ //商户分成信息初始化
+ ShopProportion shopProportion = new ShopProportion();
+ shopProportion.setDelFlag(0);
+ shopProportion.setShopId(shop.getShopId());
+ shopProportion.setShopType(shop.getShopType());
+ shopProportion.setProportionPercent(new BigDecimal("100.00"));
+ shopProportion.setUpdateTime(new Date());
+ shopProportion.setUpdateUserId(mgtEditShopDto.getUserId());
+ shopProportionService.save(shopProportion);
}
}
@@ -469,5 +494,28 @@
shopStaffService.saveOrUpdate(shopStaff);
}
+ /**
+ * @description 平台获取商户分成列表
+ * @author jqs
+ * @date 2023/6/8 9:25
+ * @param page
+ * @param mgtShopProportionPageDto
+ * @return List<MgtShopProportionPageVo>
+ */
+ @Override
+ public List<MgtShopProportionPageVo> pageMgtShopProportion(Page page, MgtShopProportionPageDto mgtShopProportionPageDto){
+ return shopMapper.pageMgtShopProportion(page,mgtShopProportionPageDto);
+ }
+ /**
+ * @description 删除商户标签
+ * @author jqs
+ * @date 2023/6/8 15:53
+ * @param shopTag
+ * @return void
+ */
+ @Override
+ public void deleteShopTag(String shopTag){
+ shopMapper.deleteShopTag(shopTag);
+ }
}
--
Gitblit v1.7.1