From 7109e2fefaa46caffcd36b44828f48e0f8a790ba Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 11 七月 2023 09:36:50 +0800
Subject: [PATCH] 管理台bug和用户端
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 193 ++++++++++++++++++++++++++++++++----------------
1 files changed, 128 insertions(+), 65 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 dfe1539..5bf7f88 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
@@ -25,14 +25,12 @@
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.*;
-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.service.*;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.util.*;
import java.util.function.Function;
@@ -103,6 +101,8 @@
@Resource
private RemoteUserService remoteUserService;
+ @Resource
+ private RemoteSysStaffService remoteSysStaffService;
/**
* 获取商户详情
@@ -203,6 +203,12 @@
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
+ String shopDetail = shop.getShopDetail();
+ if(StringUtils.isNotBlank(shopDetail)){
+ byte[] decodedBytes = Base64.getDecoder().decode(shopDetail);
+ shopDetail = new String(decodedBytes, StandardCharsets.UTF_8);
+ shop.setShopDetail(shopDetail);
+ }
//商户编号
if(mgtEditShopDto.getShopId()==null){
String shopNo = CodeFactoryUtil.getShopNo();
@@ -277,68 +283,82 @@
}
}
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);
- //商户统计
- ShopTotal shopTotal = new ShopTotal();
- shopTotal.setShopId(shop.getShopId());
- shopTotal.setDelFlag(0);
- shopTotal.setLastPayMoney(zeroBig);
- shopTotal.setTotalActivityCount(0);
- shopTotal.setTotalOrder(0);
- shopTotal.setTotalCycleOrder(0);
- shopTotal.setTotalExperienceOrder(0);
- shopTotal.setTotalServiceOrder(0);
- shopTotal.setTotalGoodsOrder(0);
- shopTotal.setTotalServiceCount(0);
- shopTotal.setUsedServiceCount(0);
- shopTotal.setUseableServiceCount(0);
- shopTotal.setTotalCycleService(0);
- shopTotal.setUsedCycleService(0);
- shopTotal.setUseableCycleService(0);
- shopTotal.setTotalCyclePerson(0);
- shopTotal.setUseableCyclePerson(0);
- shopTotal.setTotalServiceService(0);
- shopTotal.setUsedServiceService(0);
- shopTotal.setUseableServiceService(0);
- shopTotal.setTotalServicePerson(0);
- shopTotal.setUseableServicePerson(0);
- shopTotal.setTotalExperienceService(0);
- shopTotal.setUsedExperienceService(0);
- shopTotal.setUseableExperienceService(0);
- shopTotal.setTotalExperiencePerson(0);
- shopTotal.setUseableExperiencePerson(0);
- shopTotal.setTotalOrderMoney(zeroBig);
- shopTotal.setTotalCycleMoney(zeroBig);
- shopTotal.setTotalExperienceMoney(zeroBig);
- shopTotal.setTotalServiceMoney(zeroBig);
- shopTotal.setTotalGoodsMoney(zeroBig);
- shopTotalService.save(shopTotal);
+ //生成商户关联记录
+ initNewShop(shop,mgtEditShopDto.getUserId());
}
+ }
+
+ /**
+ * @description 商户关联类初始化
+ * @author jqs
+ * @date 2023/7/7 11:25
+ * @param shop
+ * @param userId
+ * @return void
+ */
+ private void initNewShop(Shop shop,Long userId){
+ BigDecimal zeroBig = new BigDecimal("0.00");
+ //商户账户信息初始化
+ 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(userId);
+ shopProportionService.save(shopProportion);
+ //商户统计
+ ShopTotal shopTotal = new ShopTotal();
+ shopTotal.setShopId(shop.getShopId());
+ shopTotal.setDelFlag(0);
+ shopTotal.setLastPayMoney(zeroBig);
+ shopTotal.setTotalActivityCount(0);
+ shopTotal.setTotalOrder(0);
+ shopTotal.setTotalCycleOrder(0);
+ shopTotal.setTotalExperienceOrder(0);
+ shopTotal.setTotalServiceOrder(0);
+ shopTotal.setTotalGoodsOrder(0);
+ shopTotal.setTotalServiceCount(0);
+ shopTotal.setUsedServiceCount(0);
+ shopTotal.setUseableServiceCount(0);
+ shopTotal.setTotalCycleService(0);
+ shopTotal.setUsedCycleService(0);
+ shopTotal.setUseableCycleService(0);
+ shopTotal.setTotalCyclePerson(0);
+ shopTotal.setUseableCyclePerson(0);
+ shopTotal.setTotalServiceService(0);
+ shopTotal.setUsedServiceService(0);
+ shopTotal.setUseableServiceService(0);
+ shopTotal.setTotalServicePerson(0);
+ shopTotal.setUseableServicePerson(0);
+ shopTotal.setTotalExperienceService(0);
+ shopTotal.setUsedExperienceService(0);
+ shopTotal.setUseableExperienceService(0);
+ shopTotal.setTotalExperiencePerson(0);
+ shopTotal.setUseableExperiencePerson(0);
+ shopTotal.setTotalOrderMoney(zeroBig);
+ shopTotal.setTotalCycleMoney(zeroBig);
+ shopTotal.setTotalExperienceMoney(zeroBig);
+ shopTotal.setTotalServiceMoney(zeroBig);
+ shopTotal.setTotalGoodsMoney(zeroBig);
+ shopTotalService.save(shopTotal);
}
/**
@@ -482,6 +502,12 @@
Shop shop = this.getById(shopId);
//基本信息拷贝
BeanUtils.copyProperties(shop,mgtShopInfoVo);
+ String shopDetail = mgtShopInfoVo.getShopDetail();
+ if(StringUtils.isNotBlank(shopDetail)){
+ byte[] encodedBytes = Base64.getEncoder().encode(shopDetail.getBytes(StandardCharsets.UTF_8));
+ shopDetail = new String(encodedBytes, StandardCharsets.UTF_8);
+ mgtShopInfoVo.setShopDetail(shopDetail);
+ }
//商户标签
List<ShopRelTag> shopRelTagList = shopRelTagService.listShopRelTagByShopId(shopId);
if(shopRelTagList!=null&&!shopRelTagList.isEmpty()){
@@ -639,6 +665,43 @@
}
/**
+ * 获取获取员工端首页统计
+ * @param userId
+ * @return
+ */
+ @Override
+ public MerHomeShopTotalVo getStaffHomeTotal(Long userId){
+ List<Long> userIds = null;
+ List<Long> shopIds = null;
+ //如果是leader 查询leader下面所有的员工下的所有shopId
+ if(remoteSysStaffService.isLeader()){
+ Long deptId = sysUserService.getSysUser(userId).getData().getDeptId();
+ userIds = remoteSysStaffService.getUserIds(deptId).getData();
+ //根据用户所有id查询关联的商户id
+ MgtBasePlatformDto mgtBasePlatformDto = new MgtBasePlatformDto();
+ mgtBasePlatformDto.setUserIdList(userIds);
+ shopIds = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
+ }else {
+ //普通员工查询商户归属的shopId
+ MgtShopIdByCodeDto mgtShopIdByCodeDto = new MgtShopIdByCodeDto();
+ mgtShopIdByCodeDto.setBelongUserId(userId);
+ shopIds = shopMapper.getShopIdByCode(mgtShopIdByCodeDto);
+ }
+ //分别查询
+ MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
+ merHomeShopTotalVo.setShopIds(shopIds);
+ MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
+ merHomeShopTotalVo.setTodayShop(null!=orderVo?orderVo.getTodayShop():0);
+ merHomeShopTotalVo.setUnHandleOrder(null!=orderVo?orderVo.getUnHandleOrder():0);
+ merHomeShopTotalVo.setShopTurnover(null!=orderVo?orderVo.getShopTurnover():BigDecimal.ZERO);
+ ShopTotal shopTotal = shopTotalService.shopsTotalByIds(shopIds);
+ merHomeShopTotalVo.setCycleSurp(null!=shopTotal?shopTotal.getUseableCyclePerson():0);
+ merHomeShopTotalVo.setExplorationSurp(null!=shopTotal?shopTotal.getUseableExperiencePerson():0);
+ Integer taskCount = memberTaskService.getMembersIngTotal(shopIds);
+ merHomeShopTotalVo.setTask(taskCount);
+ return merHomeShopTotalVo;
+ }
+ /**
* 获取商户端
* @param userId
* @return
--
Gitblit v1.7.1