From fa960ac22a90b4d960865a66f88558924720d608 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 07 六月 2023 18:00:53 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 66 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 10 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 5177708..b549e3b 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
@@ -3,7 +3,10 @@
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
@@ -11,23 +14,22 @@
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.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;
@@ -74,6 +76,18 @@
@Resource
private ShopStaffService shopStaffService;
+
+ @Resource
+ private ShopAccountService shopAccountService;
+
+ @Resource
+ private ShopAuthenticationService shopAuthenticationService;
+
+ @Resource
+ private ShopProportionService shopProportionService;
+
+
+
/**
* 获取商户详情
* @param shopId
@@ -116,6 +130,7 @@
@Override
public void createShop(MgtEditShopDto MGTEditShopDto){
Shop shop = new Shop();
+ Boolean newShop = false;
if(MGTEditShopDto.getShopId()!=null){
shop = this.getById(MGTEditShopDto.getShopId());
shop.setUpdateTime(new Date());
@@ -129,9 +144,12 @@
shopRelUserService.deleteByShopId(shop.getShopId());
shopStaffService.clearShopStaffRelation(shop.getShopId());
}else{
- shop.setShopStatus(2);
+ shop.setShopStatus(3);
shop.setCreateTime(new Date());
shop.setCreateUserId(MGTEditShopDto.getUserId());
+ shop.setFrozenFlag(0);
+ shop.setCooperativeFlag(0);
+ newShop = true;
}
BeanUtils.copyProperties(MGTEditShopDto,shop);
this.saveOrUpdate(shop);
@@ -205,6 +223,34 @@
shopFileService.save(shopFile);
}
}
+ if(newShop){
+ //商户账户信息初始化
+ ShopAccount shopAccount = new ShopAccount();
+ shopAccount.setShopId(shop.getShopId());
+ shopAccount.setDelFlag(0);
+ shopAccount.setTotalIncome(new BigDecimal("0"));
+ shopAccount.setTotalDisburse(new BigDecimal("0"));
+ shopAccount.setTotalRefund(new BigDecimal("0"));
+ shopAccount.setTotalProfitsharing(new BigDecimal("0"));
+ shopAccount.setTotalMoney(new BigDecimal("0"));
+ shopAccountService.save(shopAccount);
+ //商户认证信息初始化
+ String authId = IdUtils.simpleUUID();
+ ShopAuthentication shopAuthentication = new ShopAuthentication();
+ shopAuthentication.setAuthId(authId);
+ shopAuthentication.setDelFlag(0);
+ shopAuthentication.setShopId(shop.getShopId());
+ 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);
+ }
}
/**
--
Gitblit v1.7.1