From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 8a4dc81..7c330bb 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,4 +1,5 @@
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;
@@ -75,6 +76,14 @@
@Resource
private ShopStaffService shopStaffService;
+
+ @Resource
+ private ShopAccountService shopAccountService;
+
+ @Resource
+ private ShopAuthenticationService shopAuthenticationService;
+
+
/**
* 获取商户详情
* @param shopId
@@ -117,6 +126,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(DateUtils.getNowDate());
@@ -130,9 +140,12 @@
shopRelUserService.deleteByShopId(shop.getShopId());
shopStaffService.clearShopStaffRelation(shop.getShopId());
}else{
- shop.setShopStatus(2);
+ shop.setShopStatus(3);
shop.setCreateTime(DateUtils.getNowDate());
shop.setCreateUserId(MGTEditShopDto.getUserId());
+ shop.setFrozenFlag(0);
+ shop.setCooperativeFlag(0);
+ newShop = true;
}
BeanUtils.copyProperties(MGTEditShopDto,shop);
this.saveOrUpdate(shop);
@@ -206,6 +219,23 @@
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.saveOrUpdate(shopAccount);
+ String authId = IdUtils.simpleUUID();
+ ShopAuthentication shopAuthentication = new ShopAuthentication();
+ shopAuthentication.setAuthId(authId);
+ shopAuthentication.setDelFlag(0);
+ shopAuthentication.setShopId(shop.getShopId());
+ shopAuthenticationService.saveOrUpdate(shopAuthentication);
+ }
}
/**
--
Gitblit v1.7.1