From 25314d6c4fe5155691a75f9ea2be8608efeca359 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 02 六月 2023 18:56:54 +0800
Subject: [PATCH] 商户管理调整
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 5 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 8e5889c..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,8 +1,10 @@
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.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
@@ -74,6 +76,14 @@
@Resource
private ShopStaffService shopStaffService;
+
+ @Resource
+ private ShopAccountService shopAccountService;
+
+ @Resource
+ private ShopAuthenticationService shopAuthenticationService;
+
+
/**
* 获取商户详情
* @param shopId
@@ -116,19 +126,26 @@
@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());
+ shop.setUpdateTime(DateUtils.getNowDate());
shop.setUpdateUserId(MGTEditShopDto.getUserId());
shop.setShopTags(null);
//清空关联记录
shopFileService.deleteByShopId(shop.getShopId());
shopRelTagService.deleteByShopId(shop.getShopId());
shopRelUserService.deleteByShopId(shop.getShopId());
+ //清空归属
+ shopRelUserService.deleteByShopId(shop.getShopId());
+ shopStaffService.clearShopStaffRelation(shop.getShopId());
}else{
- shop.setShopStatus(2);
- shop.setCreateTime(new Date());
+ 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);
@@ -158,6 +175,9 @@
shop.setShopTags(shopTagSj.toString());
this.saveOrUpdate(shop);
}
+ //商户归属员工
+ SysUser belongSysUser = sysUserService.getSysUser(shop.getBelongUserId()).getData();
+ handleShopStaff(shop.getShopId(),belongSysUser);
//商户关联人员
String relUserIds = MGTEditShopDto.getRelUserIds();
if(StringUtils.isNotBlank(relUserIds)){
@@ -176,6 +196,7 @@
shopRelUser.setUserMobile(sysUser.getPhonenumber());
shopRelUser.setUserDeptId(sysUser.getDeptId());
shopRelUserService.save(shopRelUser);
+ handleShopStaff(shop.getShopId(),sysUser);
}
}
//商户封面
@@ -198,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);
+ }
}
/**
@@ -213,7 +251,7 @@
try {
Date coopStartDate = simpleDateFormat.parse(coopStartTime);
Date coopEndDate = simpleDateFormat.parse(coopEndTime);
- Date nowTime = new Date();
+ Date nowTime = DateUtils.getNowDate();
shop.setCooperationStartTime(coopStartDate);
shop.setCooperationEndTime(coopEndDate);
Boolean inTime = false;
@@ -350,6 +388,7 @@
if(member!=null&&member.getBindingFlag()!=1){
AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
appMemberBindingDto.setShopId(shop.getShopId());
+ appMemberBindingDto.setShopName(shop.getShopName());
appMemberBindingDto.setUserId(member.getUserId());
appMemberBindingDto.setBindingFlag(0);
remoteMemberService.updateMemberBinding(appMemberBindingDto);
@@ -375,6 +414,11 @@
return shop;
}
+ /**
+ * 获取商户端
+ * @param userId
+ * @return
+ */
@Override
public MerHomeShopTotalVo getMerHomeTotal(Long userId){
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
@@ -390,7 +434,7 @@
}
/**
- *
+ * 获取商户绑定代理商
* @param page
* @param merAgencyPageDto
* @return
@@ -401,6 +445,11 @@
return merAgencyPageVoList;
}
+ /**
+ * 处理商户员工
+ * @param shopId
+ * @param sysUser
+ */
private void handleShopStaff(Long shopId,SysUser sysUser){
ShopStaff shopStaff = shopStaffService.getByUserId(sysUser.getUserId());
if(shopStaff!=null){
@@ -419,4 +468,6 @@
}
shopStaffService.saveOrUpdate(shopStaff);
}
+
+
}
--
Gitblit v1.7.1