From 0774ea976b6aa86a8a7de334fa24fbd7524295d5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:57:11 +0800
Subject: [PATCH] 看板统计
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 681 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 624 insertions(+), 57 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 e42a5dc..a594dea 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,16 +1,24 @@
package com.ruoyi.shop.service.impl.shop;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
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.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsResult;
import com.github.binarywang.wxpay.bean.ecommerce.ApplymentsStatusResult;
+import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverRequest;
+import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingReceiverResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.constant.CacheConstants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.ExceptionUtil;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
@@ -19,6 +27,7 @@
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.pojo.shop.*;
import com.ruoyi.shop.domain.pojo.task.ShopFile;
+import com.ruoyi.shop.domain.pojo.task.ShopTask;
import com.ruoyi.shop.domain.vo.*;
import com.ruoyi.shop.enums.WxApplyMentStateEnum;
import com.ruoyi.shop.mapper.shop.ShopMapper;
@@ -26,8 +35,13 @@
import com.ruoyi.shop.service.task.MemberTaskService;
import com.ruoyi.shop.service.task.ShopFileService;
import com.ruoyi.shop.service.task.ShopTaskService;
+import com.ruoyi.shop.util.HuiFuTianXiaUtil;
import com.ruoyi.shop.util.WechatPayUtils;
+import com.ruoyi.shop.util.map.MapUtil;
+import com.ruoyi.shop.util.map.vo.TencentDistanceMatrix;
+import com.ruoyi.shop.util.map.vo.TencentDistanceMatrixElements;
import com.ruoyi.system.api.constant.AppErrorConstant;
+import com.ruoyi.system.api.constant.SecurityConstant;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.domain.poji.member.Member;
@@ -35,12 +49,17 @@
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.service.*;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
+import java.rmi.ServerException;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -54,6 +73,7 @@
* @since 2023-04-25
*/
@Service
+@Log4j2
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
@Resource
@@ -93,6 +113,9 @@
private ShopAuthenticationService shopAuthenticationService;
@Resource
+ private ShopAuthenticationHftxService shopAuthenticationHftxService;
+
+ @Resource
private ShopProportionService shopProportionService;
@Resource
@@ -121,6 +144,17 @@
@Resource
private WechatPayUtils wechatPayUtils;
+
+ @Resource
+ private ShopDetailService shopDetailService;
+
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @Value("${callback_path}")
+ private String callback_path;
+
+
/**
* 获取商户详情
@@ -170,6 +204,9 @@
//验证关联账号唯一
String relUserIds = mgtEditShopDto.getRelUserIds();
if(StringUtils.isNotBlank(relUserIds)) {
+ if(relUserIds.startsWith(",")){
+ relUserIds = relUserIds.substring(1);
+ }
String[] relUserIdArray = relUserIds.split(",");
ShopRelUser shopRelUser;
Long userId;
@@ -193,11 +230,12 @@
}
//验证商户名唯一
- Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
+ //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())){
+ //取消验重
+ /*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());
@@ -207,7 +245,6 @@
shopRelTagService.deleteByShopId(shop.getShopId());
shopRelUserService.deleteByShopId(shop.getShopId());
//清空归属
- shopRelUserService.deleteByShopId(shop.getShopId());
shopStaffService.clearShopStaffRelation(shop.getShopId());
if(!shop.getShopName().equals(mgtEditShopDto.getShopName())){
MgtMemberShopNameDto mgtMemberShopNameDto = new MgtMemberShopNameDto();
@@ -216,16 +253,18 @@
remoteMemberService.updateMemberShopName(mgtMemberShopNameDto);
}
}else{
- if(shopSame!=null){
+ //取消验重
+ /*if(shopSame!=null){
throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
- }
+ }*/
shop.setDelFlag(0);
shop.setShopStatus(3);
shop.setCreateTime(new Date());
shop.setCreateUserId(mgtEditShopDto.getUserId());
shop.setFrozenFlag(0);
- shop.setCooperativeFlag(0);
+ shop.setCooperativeFlag(1);
shop.setAuthFlag(0);
+ shop.setAccountFlag(0);
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
@@ -312,7 +351,7 @@
//生成商户关联记录
initNewShop(shop,mgtEditShopDto.getUserId());
CodeGetDto codeGetDto = new CodeGetDto();
- String url = "https://wxapp.hhhrt.cn/mini/activity?activityId="+shop.getShopId();
+ String url = "https://wxapp.hhhrt.cn/mini/shop?id="+shop.getShopId();
codeGetDto.setUrl(url);
codeGetDto.setFileName("shop-"+shop.getShopId());
String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
@@ -347,13 +386,20 @@
shopAuthentication.setAuthId(authId);
shopAuthentication.setDelFlag(0);
shopAuthentication.setShopId(shop.getShopId());
+ shopAuthentication.setAuditStatus(0);
+ shopAuthentication.setSignState(1);
shopAuthenticationService.save(shopAuthentication);
//商户分成信息初始化
ShopProportion shopProportion = new ShopProportion();
shopProportion.setDelFlag(0);
shopProportion.setShopId(shop.getShopId());
shopProportion.setShopType(shop.getShopType());
- shopProportion.setProportionPercent(new BigDecimal("100.00"));
+ String proportionPercentStr = redisService.getCacheObject(SecurityConstant.SHOP_COMMON_PROPORTION);
+ BigDecimal proportionPercent = new BigDecimal(proportionPercentStr);
+ if(proportionPercent==null){
+ proportionPercent = new BigDecimal("30");
+ }
+ shopProportion.setProportionPercent(proportionPercent);
shopProportion.setUpdateTime(new Date());
shopProportion.setUpdateUserId(userId);
shopProportionService.save(shopProportion);
@@ -506,12 +552,13 @@
* @return
*/
@Override
- public List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto){
+ public List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto,List<Long> scope){
if (StringUtils.isNotBlank(mgtShopPageDto.getShopTags())) {
mgtShopPageDto.setShopTags(mgtShopPageDto.getShopTags().replace(",", "|"));
}
+
// 分页查询商铺信息
- List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto);
+ List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto,scope);
// 如果查询结果不为空
if (!mgtShopPageVoList.isEmpty()) {
// 创建签约用户ID集合和所属用户ID集合
@@ -553,8 +600,9 @@
shopPageVo.setSignUser(signUserMap.get(shopPageVo.getSignUserId()).getNickName());
}
if (belongUserMap!=null&&!belongUserMap.isEmpty()&&shopPageVo.getBelongUserId() != null) {
- shopPageVo.setBelongUser(belongUserMap.get(shopPageVo.getBelongUserId()).getNickName());
- shopPageVo.setBelongDept(belongUserMap.get(shopPageVo.getBelongUserId()).getDeptName());
+ MgtSysSimpleUserVo mgtSysSimpleUserVo = belongUserMap.get(shopPageVo.getBelongUserId());
+ shopPageVo.setBelongUser(null == mgtSysSimpleUserVo ? "" : mgtSysSimpleUserVo.getNickName());
+ shopPageVo.setBelongDept(null == mgtSysSimpleUserVo ? "" : mgtSysSimpleUserVo.getDeptName());
}
}
}
@@ -588,13 +636,19 @@
}
mgtShopInfoVo.setShopTagIds(shopTagJs.toString());
}
+ //归属员工
if(mgtShopInfoVo.getBelongUserId()!=null){
SysUser sysUser = sysUserService.getSysUser(mgtShopInfoVo.getBelongUserId()).getData();
- mgtShopInfoVo.setBelongUserName(sysUser.getNickName());
+ if(sysUser!=null){
+ mgtShopInfoVo.setBelongUserName(sysUser.getNickName());
+ }
}
+ //归属商户
if(mgtShopInfoVo.getBelongShopId()!=null){
Shop belongShop = this.getByShopId(mgtShopInfoVo.getBelongShopId());
- mgtShopInfoVo.setBelongShopName(belongShop.getShopName());
+ if(belongShop!=null){
+ mgtShopInfoVo.setBelongShopName(belongShop.getShopName());
+ }
}
//商户关联用户
List<ShopRelUser> shopRelUserList = shopRelUserService.listByShopId(shopId);
@@ -683,7 +737,6 @@
shopTransferRecord.setAfterUserId(mgtTransferShopDto.getTransferUserId());
shopTransferRecord.setTransferRemark(mgtTransferShopDto.getTransferRemark());
shopTransferRecordService.save(shopTransferRecord);
- shopRelUserService.deleteByUserId(shop.getBelongUserId());
}
shop.setBelongUserId(mgtTransferShopDto.getTransferUserId());
this.saveOrUpdate(shop);
@@ -712,8 +765,32 @@
//获取绑定商户
shop = this.getById(member.getRelationShopId());
}else if(StringUtils.isNotBlank(appNearbyShopDto.getLatitude())&&StringUtils.isNotBlank(appNearbyShopDto.getLongitude())){
- AppNearShopVo appNearShopVo = shopMapper.getNearbyShop(appNearbyShopDto);
- shop = this.getById(appNearShopVo.getShopId());
+ List<AppNearShopVo> appNearShopVos = shopMapper.getNearbyShops(appNearbyShopDto);
+ if(appNearShopVos.size() > 0){
+ log.info("候选店铺：{}", JSON.toJSONString(appNearShopVos));
+ StringBuffer to = new StringBuffer();
+ for (AppNearShopVo appNearShopVo : appNearShopVos) {
+ to.append(appNearShopVo.getLatitude() + "," + appNearShopVo.getLongitude() + ";");
+ }
+ String form = appNearbyShopDto.getLatitude() + "," + appNearbyShopDto.getLongitude();
+ R<List<TencentDistanceMatrix>> r = MapUtil.tencentDistanceMatrix(form, to.substring(0, to.length() - 1), "walking");
+ if(r.getCode() != 200){
+ throw new ServiceException(r.getMsg());
+ }
+ List<TencentDistanceMatrix> data = r.getData();
+ //存储最短距离
+ BigDecimal dis = new BigDecimal(0);
+ AppNearShopVo appNearShopVo = null;
+ List<TencentDistanceMatrixElements> elements = data.get(0).getElements();
+ for (int i = 0; i < elements.size(); i++) {
+ TencentDistanceMatrixElements matrix = elements.get(i);
+ if(i == 0 || dis.compareTo(new BigDecimal(matrix.getDistance())) > 0){
+ dis = new BigDecimal(matrix.getDistance());
+ appNearShopVo = appNearShopVos.get(i);
+ }
+ }
+ shop = this.getById(appNearShopVo.getShopId());
+ }
}else{
return appNearbyShopVo;
}
@@ -725,6 +802,20 @@
appMemberBindingDto.setBindingFlag(0);
remoteMemberService.updateMemberBinding(appMemberBindingDto);
}
+ //商品图片
+ List<ShopFile> shopFileList = shopFileService.listShopFileByShopId(shop.getShopId());
+ String shopPicture = null;
+ StringJoiner shopBanners = new StringJoiner(",");
+ if(shopFileList!=null&&!shopFileList.isEmpty()){
+ for(ShopFile shopFile : shopFileList){
+ if(shopFile.getFileType()==1){
+ shopPicture = shopFile.getFileUrl();
+ }else{
+ shopBanners.add(shopFile.getFileUrl());
+ }
+ }
+ }
+ appNearbyShopVo.setShopPicture(shopPicture);
appNearbyShopVo.setShopId(shop.getShopId());
appNearbyShopVo.setShopName(shop.getShopName());
appNearbyShopVo.setShopAddress(shop.getShopAreaName()+shop.getShopAddress());
@@ -753,24 +844,71 @@
*/
@Override
public StaffHomeShopTotalVo getStaffHomeTotal(Long userId){
- List<Long> userIds = null;
- List<Long> shopIds = null;
+ List<Long> userIds = new ArrayList<>();
+ List<Long> shopIds = new ArrayList<>();
//如果是leader 查询leader下面所有的员工下的所有shopId
- if(remoteSysStaffService.isLeader()){
+// if(remoteSysStaffService.isLeader()){
+// userIds = sysUserService.getUserIdsByDept(userId).getData();
+// //根据用户所有id查询关联的商户id
+// MgtBasePlatformDto mgtBasePlatformDto = new MgtBasePlatformDto();
+// mgtBasePlatformDto.setUserIdList(userIds);
+// shopIds = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
+// List<Shop> shopList = this.getShopByBelongUserId(userId);
+// if(shopList!=null&&!shopList.isEmpty()){
+// for(Shop shop : shopList){
+// shopIds.add(shop.getShopId());
+// }
+// userIds.add(userId);
+// }
+// }else {
+// //普通员工查询商户归属的shopId
+// List<Shop> shopList = this.getShopByBelongUserId(userId);
+// if(shopList!=null&&!shopList.isEmpty()){
+// for(Shop shop : shopList){
+// shopIds.add(shop.getShopId());
+// }
+// userIds.add(userId);
+// }
+// }
+
+ // TODO: 2023/12/5 统一改成使用权限来控制数据
+ R<SysUser> sysUser = sysUserService.getSysUser(userId);
+ if(sysUser.getCode() != 200){
+ throw new RuntimeException(sysUser.getMsg());
+ }
+ //员工端数据权限（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
+ //2/4暂未使用
+ String dataScopeEmployee = sysUser.getData().getDataScopeEmployee();
+ if(dataScopeEmployee.equals("1")){
+ userIds = null;
+ shopIds = null;
+ }
+ if(dataScopeEmployee.equals("3")){
userIds = sysUserService.getUserIdsByDept(userId).getData();
//根据用户所有id查询关联的商户id
MgtBasePlatformDto mgtBasePlatformDto = new MgtBasePlatformDto();
mgtBasePlatformDto.setUserIdList(userIds);
shopIds = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
- Shop shop = this.getShopByBelongUserId(userId);
- shopIds.add(shop.getShopId());
- }else {
- //普通员工查询商户归属的shopId
- Shop shop = this.getShopByBelongUserId(userId);
- shopIds.add(shop.getShopId());
+ List<Shop> shopList = this.getShopByBelongUserId(userId);
+ if(shopList!=null&&!shopList.isEmpty()){
+ for(Shop shop : shopList){
+ shopIds.add(shop.getShopId());
+ }
+ userIds.add(userId);
+ }
}
+ if(dataScopeEmployee.equals("5")){
+ List<Shop> shopList = this.getShopByBelongUserId(userId);
+ if(shopList!=null&&!shopList.isEmpty()){
+ for(Shop shop : shopList){
+ shopIds.add(shop.getShopId());
+ }
+ userIds.add(userId);
+ }
+ }
+
//分别查询
- StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(shopIds);
+ StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
Integer shopTaskCount = shopTaskService.getShopIngTotal(shopIds);
staffHomeShopTotalVo.setFollowMember(0);
staffHomeShopTotalVo.setNewMember(0);
@@ -796,9 +934,13 @@
}
merHomeShopTotalVo.setShopId(shopId);
Shop shop = this.getById(shopId);
+ if(shop.getFrozenFlag()==1){
+ String userKey = SecurityUtils.getUserKey();
+ redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
+ throw new ServiceException("商户已被冻结,请联系管理员",401);
+ }
merHomeShopTotalVo.setShopType(shop.getShopType());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
- ShopTotal shopTotal = shopTotalService.getById(shopId);
merHomeShopTotalVo.setShopId(shopId);
merHomeShopTotalVo.setShopType(shop.getShopType());
merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
@@ -806,8 +948,8 @@
Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
merHomeShopTotalVo.setTask(taskCount);
merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
- merHomeShopTotalVo.setCycleSurp(shopTotal.getUseableCyclePerson());
- merHomeShopTotalVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
+ merHomeShopTotalVo.setCycleSurp(orderVo.getCycleSurp());
+ merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
return merHomeShopTotalVo;
@@ -902,8 +1044,8 @@
* @return List<MgtShopListSimpleVo>
*/
@Override
- public List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto){
- return shopMapper.listMgtShopSimpleVo(mgtShopListDto);
+ public List<MgtShopListSimpleVo> listMgtShopSimpleVo(MgtShopListDto mgtShopListDto,List<Long> scope){
+ return shopMapper.listMgtShopSimpleVo(mgtShopListDto,scope);
}
/**
@@ -940,8 +1082,20 @@
* @date 2023/6/14 23:01
*/
@Override
- public List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto){
- return shopMapper.pageMgtShopAuth(page, mgtShopAuthPageDto);
+ public List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, MgtShopAuthPageDto mgtShopAuthPageDto,List<Long> scope){
+ return shopMapper.pageMgtShopAuth(page, mgtShopAuthPageDto,scope);
+ }
+
+ /**
+ * 商户进件列表数据（汇付天下）
+ * @param page
+ * @param mgtShopAuthPageDto
+ * @return
+ */
+ @Override
+ public List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, MgtShopHFTXAuthPageDto mgtShopAuthPageDto,
+ List<Long> scope) {
+ return shopMapper.pageMgtShopHFTXAuth(page, mgtShopAuthPageDto,scope);
}
/**
@@ -952,8 +1106,8 @@
* @date 2023/6/18 16:59
*/
@Override
- public MgtBulletinBoardVo boardShopTotal(){
- MgtBulletinBoardVo mgtBulletinBoardVoShop = shopMapper.shopTotal();
+ public MgtBulletinBoardVo boardShopTotal(List<Long> userIds){
+ MgtBulletinBoardVo mgtBulletinBoardVoShop = shopMapper.shopTotal(userIds);
return mgtBulletinBoardVoShop;
}
@@ -965,16 +1119,119 @@
* @return void
*/
@Override
- public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) throws WxPayException {
+ public void mgtShopAuth(MgtShopAuthDto mgtShopAuthDto) {
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthDto.getAuthId());
Shop shop = this.getByShopId(shopAuthentication.getShopId());
- String applyNumber = IdUtils.simpleUUID();
+
+ if(mgtShopAuthDto.getBlBusinessFoeverFlag()!=null&&mgtShopAuthDto.getBlBusinessFoeverFlag()==1){
+ mgtShopAuthDto.setBlBusinessDeanline("长期");
+ }
+ if(mgtShopAuthDto.getLpIcForeverFlag()!=null&&mgtShopAuthDto.getLpIcForeverFlag()==1){
+ mgtShopAuthDto.setLpIcEndDate("长期");
+ }
BeanUtils.copyProperties(mgtShopAuthDto , shopAuthentication);
- shopAuthentication.setApplyNumber(applyNumber);
+ String applyNumber = shopAuthentication.getApplyNumber();
+ if(StringUtils.isBlank(applyNumber)){
+ applyNumber = IdUtils.simpleUUID();
+ shopAuthentication.setApplyNumber(applyNumber);
+ }
+ ApplymentsResult applymentsResult;
+ try {
+ applymentsResult = wechatPayUtils.ecommerceApply(shopAuthentication,applyNumber,shop);
+ } catch (Exception e) {
+ log.debug("-----"+shop.getShopId()+":进件异常-----");
+ throw new ServiceException(e.getMessage());
+ }
shopAuthentication.setAuditStatus(3);
+ shopAuthentication.setApplymentId(applymentsResult.getApplymentId());
shopAuthenticationService.saveOrUpdate(shopAuthentication);
- wechatPayUtils.ecommerceApply(shopAuthentication,applyNumber,shop);
}
+
+
+ /**
+ * 商户进件（汇付天下）
+ * @param mgtShopHFTXAuthDto
+ */
+ @Override
+ public void mgtShopHFTXAuth(MgtShopHFTXAuthDto mgtShopHFTXAuthDto) {
+ ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>()
+ .eq("shop_id", mgtShopHFTXAuthDto.getShopId()).eq("is_delete", 0));
+ if(null != shopAuthenticationHftx && Arrays.asList("U", "Y").contains(shopAuthenticationHftx.getAuditStatus())){
+ throw new ServiceException("不能重复进件");
+ }
+ if(null == shopAuthenticationHftx){
+ shopAuthenticationHftx = new ShopAuthenticationHftx();
+ shopAuthenticationHftx.setIsDelete(0);
+ shopAuthenticationHftx.setInsertTime(new Date());
+ }
+ String auditStatus = shopAuthenticationHftx.getAuditStatus();
+ BeanUtils.copyProperties(mgtShopHFTXAuthDto, shopAuthenticationHftx);
+ shopAuthenticationHftx.setReqSeqId(IdUtils.simpleUUID());
+ shopAuthenticationHftx.setAuditStatus("");
+ shopAuthenticationHftx.setAuditDesc("");
+ /**
+ * 开始调起进件接口
+ */
+ R<MerchantBasicdataVo> r = null;
+ //用户（重新提交）
+ if((StringUtils.isEmpty(auditStatus) || "N".equals(auditStatus) || "F".equals(auditStatus)) && mgtShopHFTXAuthDto.getType() == 1){
+ r = HuiFuTianXiaUtil.merchantBasicdataIndv(mgtShopHFTXAuthDto, shopAuthenticationHftx, callback_path + "/shop/mgt/shop/merchantBasicdataNotify");
+ }
+ //企业进件（重新提交）
+ if((StringUtils.isEmpty(auditStatus) || "N".equals(auditStatus) || "F".equals(auditStatus)) && mgtShopHFTXAuthDto.getType() == 2){
+ r = HuiFuTianXiaUtil.merchantBasicdataEnt(mgtShopHFTXAuthDto, shopAuthenticationHftx, callback_path + "/shop/mgt/shop/merchantBasicdataNotify");
+ }
+
+ //修改资料
+ if("Y".equals(auditStatus)){
+ r = HuiFuTianXiaUtil.merchantBasicdataModify(mgtShopHFTXAuthDto, shopAuthenticationHftx, callback_path + "/shop/mgt/shop/merchantBasicdataNotify");
+ }
+ if(null == r){
+ throw new ServiceException("参数异常");
+ }
+ if(r.getCode() == 200){
+ MerchantBasicdataVo data = r.getData();
+ shopAuthenticationHftx.setAuditStatus("U");
+ shopAuthenticationHftx.setHuifuId(data.getHuifuId());
+ shopAuthenticationHftx.setTokenNo(data.getTokenNo());
+ shopAuthenticationHftx.setApplyNo(data.getApplyNo());
+ shopAuthenticationHftxService.saveOrUpdate(shopAuthenticationHftx);
+ }else{
+ throw new ServiceException(r.getMsg());
+ }
+
+ }
+
+
+ /**
+ * 商户进件异步通知
+ * @return
+ */
+ @Override
+ public R<String> merchantBasicdataNotify(MerchantBasicDataNotifyDto dto) {
+ R<MerchantBasicdataVo> merchantBasicdataVoR = HuiFuTianXiaUtil.merchantBasicDataNotify(dto);
+ if(merchantBasicdataVoR.getCode() != 200){
+ return R.fail(merchantBasicdataVoR.getMsg());
+ }
+ MerchantBasicdataVo data = merchantBasicdataVoR.getData();
+ ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>().eq("req_seq_id", data.getReqSeqId()));
+ if("U".equals(shopAuthenticationHftx.getAuditStatus())){
+ shopAuthenticationHftx.setAuditStatus(data.getAuditStatus());
+ shopAuthenticationHftx.setAuditDesc(data.getAuditDesc());
+ shopAuthenticationHftx.setHuifuId(data.getHuifuId());
+ shopAuthenticationHftx.setTokenNo(data.getTokenNo());
+ shopAuthenticationHftx.setApplyNo(data.getApplyNo());
+ shopAuthenticationHftxService.updateById(shopAuthenticationHftx);
+ if("Y".equals(data.getAuditStatus())){
+ Shop shop = this.getByShopId(shopAuthenticationHftx.getShopId());
+ shop.setShopStatus(1);
+ shop.setAuthFlag(1);
+ this.updateById(shop);
+ }
+ }
+ return R.ok(data.getReqSeqId());
+ }
+
/**
* @description 获取平台商户统计
@@ -1000,8 +1257,20 @@
mgtBasePlatformDto.setUserIdList(userIdList);
}
}
+ //数据权限
+ List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
+ if(null != userIds){
+ List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
+ if(null != userIdList){
+ userIdList.addAll(userIds);
+ }else{
+ userIdList = userIds;
+ }
+ mgtBasePlatformDto.setUserIdList(userIdList);
+ }
+
//获取基础统计
- MgtPlTotalShopTotalVo plTotalShopTotalVo = shopMapper.getPlTotalShopTotal();
+ MgtPlTotalShopTotalVo plTotalShopTotalVo = shopMapper.getPlTotalShopTotal(userIds);
plTotalShopTotalVo.setSignTotal(0);
List<Long> shopIdList = shopMapper.listShopIdByTotal(mgtBasePlatformDto);
if (!shopIdList.isEmpty()) {
@@ -1030,13 +1299,17 @@
plTotalShopTotalVo.setAreaRankVos(shopAreaRank);
}
//获取销售排名
- List<MgtMapIntTotalVo> shopSalesRank = shopMapper.listShopSalesRank(mgtBasePlatformDto);
+ List<MgtMapBigTotalVo> shopSalesRank = remoteOrderService.shopSalesRank(shopIdList).getData();
if (shopSalesRank != null && shopSalesRank.size() > 0) {
String[] shopSalesKey = new String[shopSalesRank.size()];
- Integer[] shopSalesValue = new Integer[shopSalesRank.size()];
+ BigDecimal[] shopSalesValue = new BigDecimal[shopSalesRank.size()];
// 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+ Long shopId;
+ Shop shop;
for (int i = 0; i < shopSalesRank.size(); i++) {
- shopSalesKey[i] = shopSalesRank.get(i).getMapKey();
+ shopId = Long.valueOf(shopSalesRank.get(i).getMapKey());
+ shop = this.getByShopId(shopId);
+ shopSalesKey[i] = shop.getShopName();
shopSalesValue[i] = shopSalesRank.get(i).getMapValue();
}
plTotalShopTotalVo.setShopSalesRankKey(shopSalesKey);
@@ -1093,7 +1366,38 @@
MgtShopAuthGetVo shopAuthGetVo = new MgtShopAuthGetVo();
ShopAuthentication shopAuthentication = shopAuthenticationService.getById(authId);
BeanUtils.copyProperties(shopAuthentication, shopAuthGetVo);
+ if(shopAuthGetVo.getBlBusinessDeanline()!=null){
+ if(shopAuthGetVo.getBlBusinessDeanline().equals("长期")){
+ shopAuthGetVo.setBlBusinessFoeverFlag(1);
+ }else{
+ shopAuthGetVo.setBlBusinessFoeverFlag(0);
+ }
+ }
+ if(shopAuthGetVo.getLpIcEndDate()!=null){
+ if(shopAuthGetVo.getLpIcEndDate().equals("长期")){
+ shopAuthGetVo.setLpIcForeverFlag(1);
+ }else{
+ shopAuthGetVo.setLpIcForeverFlag(0);
+ }
+ }
return shopAuthGetVo;
+ }
+
+
+ /**
+ * 获取商户审核资料（汇付天下）
+ * @param shopId
+ * @return
+ */
+ @Override
+ public MgtShopHFTXAuthGetVo getMgtShopHFTXAuthInfo(Long shopId) {
+ ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>().eq("shop_id", shopId));
+ MgtShopHFTXAuthGetVo mgtShopHFTXAuthGetVo = new MgtShopHFTXAuthGetVo();
+ if(null == shopAuthenticationHftx){
+ return mgtShopHFTXAuthGetVo;
+ }
+ BeanUtils.copyProperties(shopAuthenticationHftx, mgtShopHFTXAuthGetVo);
+ return mgtShopHFTXAuthGetVo;
}
/**
@@ -1156,11 +1460,11 @@
* @return Shop
*/
@Override
- public Shop getShopByBelongUserId(Long userId){
+ public List<Shop> getShopByBelongUserId(Long userId){
LambdaQueryWrapper<Shop> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Shop::getDelFlag,0);
queryWrapper.eq(Shop::getBelongUserId,userId);
- return this.getOne(queryWrapper,false);
+ return this.list(queryWrapper);
}
/**
@@ -1186,14 +1490,39 @@
*/
@Override
public StaffShopSimpleTotalVo getStaffSimpleTotal(Long userId){
- List<Long> userIdList = null;
- if(remoteSysStaffService.isLeader()){
+ List<Long> userIdList = new ArrayList<>();
+// if(remoteSysStaffService.isLeader()){
+// userIdList = sysUserService.getUserIdsByDept(userId).getData();
+// userIdList.add(userId);
+// }else {
+// userIdList.add(userId);
+// }
+
+ // TODO: 2023/12/5 统一改成使用权限来控制数据
+ R<SysUser> sysUser = sysUserService.getSysUser(userId);
+ if(sysUser.getCode() != 200){
+ throw new RuntimeException(sysUser.getMsg());
+ }
+ //员工端数据权限（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限）
+ //2/4暂未使用
+ String dataScopeEmployee = sysUser.getData().getDataScopeEmployee();
+ if(dataScopeEmployee.equals("1")){
+ userIdList = null;
+ }
+ if(dataScopeEmployee.equals("3")){
userIdList = sysUserService.getUserIdsByDept(userId).getData();
userIdList.add(userId);
- }else {
+ }
+ if(dataScopeEmployee.equals("5")){
userIdList.add(userId);
}
- return shopMapper.getStaffSimpleTotal(userIdList);
+
+ StaffShopSimpleTotalVo shopTotal = shopMapper.getStaffSimpleTotal(1,userIdList);
+ StaffShopSimpleTotalVo agencyTotal = shopMapper.getStaffSimpleTotal(2,userIdList);
+ shopTotal.setAgencyTotal(agencyTotal.getShopTotal());
+ shopTotal.setOpenAgencyTotal(agencyTotal.getOpenShopTotal());
+ shopTotal.setCloseAgencyTotal(agencyTotal.getCloseShopTotal());
+ return shopTotal;
}
/**
@@ -1227,8 +1556,6 @@
merHomeShopTotalVo.setShopId(shopId);
// 通过远程订单服务获取商店总览信息
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
- // 获取商店总计信息
- ShopTotal shopTotal = shopTotalService.getById(shopId);
// 获取商店任务计数
Integer taskCount = memberTaskService.getMemberIngTotal(shopId);
// 设置员工商店信息对象的属性
@@ -1236,10 +1563,11 @@
staffShopInfoGetVo.setUnHandleOrder(orderVo.getUnHandleOrder());
staffShopInfoGetVo.setShopTask(taskCount);
staffShopInfoGetVo.setShopTurnover(orderVo.getShopTurnover());
- staffShopInfoGetVo.setCycleSurp(shopTotal.getUseableCyclePerson());
- staffShopInfoGetVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
+ staffShopInfoGetVo.setCycleSurp(orderVo.getCycleSurp());
+ staffShopInfoGetVo.setExplorationSurp(orderVo.getExplorationSurp());
staffShopInfoGetVo.setShopId(shopId);
staffShopInfoGetVo.setShopName(shop.getShopName());
+ staffShopInfoGetVo.setShopType(shop.getShopType());
staffShopInfoGetVo.setShopPicture(shopPicture);
staffShopInfoGetVo.setBusinessStartTime(shop.getBusinessStartTime());
staffShopInfoGetVo.setBusinessEndTime(shop.getBusinessEndTime());
@@ -1265,8 +1593,8 @@
if (shopIdList != null && !shopIdList.isEmpty()) {
Integer count = remoteMemberService.getAreaNewMember(shopIdList).getData();
staffShopInfoGetVo.setNewAreaMember(count);
- ShopTotal shopTotalAll = shopTotalService.shopsTotalByIds(shopIdList);
- staffShopInfoGetVo.setAreaTurnover(shopTotalAll.getTotalOrderMoney());
+ AgencyTotalVo agencyTotalVo = remoteOrderService.getAgencyTotalVo(shopIdList).getData();
+ staffShopInfoGetVo.setAreaTurnover(agencyTotalVo.getAreaTurnover());
}
}
// 如果商店的扩展联系方式不为空，则设置员工商店信息对象的扩展联系方式列表
@@ -1317,6 +1645,8 @@
List<ExtendContactsVo> extendContactsVoList = staffShopECEditDto.getExtendContactsVoList();
if(extendContactsVoList!=null&&!extendContactsVoList.isEmpty()){
extendContacts = JSON.toJSONString(extendContactsVoList);
+ }else{
+ extendContacts = "";
}
shop.setExtendContacts(extendContacts);
shop.setShopId(staffShopECEditDto.getShopId());
@@ -1344,8 +1674,27 @@
@Override
public void queryEcommerceApplyMentsStatus() {
+ log.info("开始获取微信二级商户待检查列表");
List<ShopAuthentication> list = shopAuthenticationService.getShopAuthNeedUpdateStatus();
+ log.info("定时检查微信二级商户"+list.toString());
list.forEach(item -> queryApplyStatusByApplymentId(item.getApplymentId(), item.getShopId()));
+
+ List<ShopAuthenticationHftx> list1 = shopAuthenticationHftxService.list(new QueryWrapper<ShopAuthenticationHftx>().eq("audit_status", "U").eq("is_delete", 0));
+ for (ShopAuthenticationHftx shopAuthenticationHftx : list1) {
+ R<MerchantBasicdataVo> r = HuiFuTianXiaUtil.queryMerchantBasicdata(IdUtils.simpleUUID(), shopAuthenticationHftx.getHuifuId());
+ if(r.getCode() == 200){
+ MerchantBasicdataVo data = r.getData();
+ if(org.springframework.util.StringUtils.hasLength(data.getTokenNo())){
+ shopAuthenticationHftx.setTokenNo(data.getTokenNo());
+ shopAuthenticationHftx.setAuditStatus("Y");
+ shopAuthenticationHftx.setAuditDesc("成功");
+ Shop shop = this.getByShopId(shopAuthenticationHftx.getShopId());
+ shop.setShopStatus(1);
+ this.updateById(shop);
+ shopAuthenticationHftxService.updateById(shopAuthenticationHftx);
+ }
+ }
+ }
}
/**
@@ -1354,6 +1703,7 @@
*/
private void queryApplyStatusByApplymentId(String applymentId, Long shopId) {
try {
+ log.debug("定时检查微信二级商户applymentId"+applymentId);
if (StringUtils.isNotBlank(applymentId)) {
ApplymentsStatusResult result = wechatPayUtils.queryApplyStatusByApplymentId(applymentId);
shopAuthenticationService.updateAuditStatusByApplymentId(applymentId, result);
@@ -1381,4 +1731,221 @@
.set(Shop::getAuthFlag, 1);
this.update(updateWrapper);
}
+
+
+
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 22:53
+ * @param cityCodes
+ * @return List<Long>
+ */
+ @Override
+ public List<Long> listShopIdByCityCode(List<String> cityCodes){
+ return shopMapper.listShopIdByCityCode(cityCodes);
+ }
+
+ @Override
+ public void authShop(){
+ ShopAuthentication shopAuthentication = shopAuthenticationService.getById("8c23fa423beb4673a0edc641a1ca0c23");
+ Shop shop = this.getByShopId(shopAuthentication.getShopId());
+ try {
+ wechatPayUtils.ecommerceApply(shopAuthentication,shopAuthentication.getApplyNumber(),shop);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * @description 修改店铺详细资料
+ * @author jqs
+ * @date 2023/8/22 14:51
+ * @param staffShopDetailDto
+ * @return void
+ */
+ @Override
+ public void editShopDetail(StaffShopDetailDto staffShopDetailDto){
+ ShopDetail shopDetail = shopDetailService.getById(staffShopDetailDto.getShopId());
+ if(shopDetail == null){
+ shopDetail = new ShopDetail();
+ shopDetail.setDelFlag(0);
+ }
+ BeanUtils.copyProperties(staffShopDetailDto, shopDetail);
+ List<StaffCustomerDto> staffCustomerDtoList = staffShopDetailDto.getStaffCustomerDtoList();
+ if(staffCustomerDtoList!=null&&!staffCustomerDtoList.isEmpty()){
+ StringJoiner customerNameSJ = new StringJoiner(",");
+ StringJoiner customerMobileSJ = new StringJoiner(",");
+ for(StaffCustomerDto staffCustomerDto : staffCustomerDtoList){
+ customerNameSJ.add(staffCustomerDto.getCustomerName());
+ customerMobileSJ.add(staffCustomerDto.getCustomerMobile());
+ }
+ shopDetail.setCustomerName(customerNameSJ.toString());
+ shopDetail.setCustomerMobile(customerMobileSJ.toString());
+ }
+ shopDetailService.saveOrUpdate(shopDetail);
+ }
+
+ /**
+ * @description 获取店铺详细资料
+ * @author jqs
+ * @date 2023/8/22 16:15
+ * @param shopId
+ * @return StaffShopDetailVo
+ */
+ @Override
+ public StaffShopDetailVo getShopDetail(Long shopId){
+ ShopDetail shopDetail = shopDetailService.getById(shopId);
+ StaffShopDetailVo staffShopDetailVo = new StaffShopDetailVo();
+ if(shopDetail!=null){
+ BeanUtils.copyProperties(shopDetail, staffShopDetailVo);
+ //处理联系人
+ String customerName = shopDetail.getCustomerName();
+ String customerMobile = shopDetail.getCustomerMobile();
+ List<StaffCustomerDto> staffCustomerDtoList = new ArrayList<>();
+ String[] customerNameArr = customerName.split(",");
+ String[] customerMobileArr = customerMobile.split(",");
+ staffShopDetailVo.setContactName(customerNameArr[0]);
+ StaffCustomerDto staffCustomerDto;
+ for(int i=0;i<customerNameArr.length;i++){
+ staffCustomerDto = new StaffCustomerDto();
+ staffCustomerDto.setCustomerName(customerNameArr[i]);
+ staffCustomerDto.setCustomerMobile(customerMobileArr[i]);
+ staffCustomerDtoList.add(staffCustomerDto);
+ }
+ staffShopDetailVo.setStaffCustomerDtoList(staffCustomerDtoList);
+ }
+ //归属客户
+ Shop shop = this.getByShopId(shopId);
+ Long belongUserId = shop.getBelongUserId();
+ if(belongUserId!=null){
+ SysUser sysUser = remoteUserService.getSysUser(belongUserId).getData();
+ if(sysUser!=null){
+ staffShopDetailVo.setBelongUser(sysUser.getNickName());
+ }
+ }
+ //最近任务时间
+ ShopTask shopTask = shopTaskService.getLastTask(shopId);
+ if(shopTask!=null){
+ staffShopDetailVo.setNextTaskDate(shopTask.getTaskDate());
+ }
+ staffShopDetailVo.setShopId(shopId);
+ return staffShopDetailVo;
+ }
+
+
+ /**
+ * @description 添加分账方
+ * @author jqs
+ * @date 2023/8/23 9:44
+ * @param
+ * @return void
+ */
+ @Override
+ public void addProfitSharingReceiver(MgtShopAuthGetDto mgtShopAuthGetDto){
+ try {
+ ShopAuthentication shopAuthentication = shopAuthenticationService.getById(mgtShopAuthGetDto.getAuthId());
+ Shop shop = this.getByShopId(shopAuthentication.getShopId());
+ if(shopAuthentication!=null&&shopAuthentication.getAuditStatus()==6){
+ ProfitSharingReceiverRequest request = new ProfitSharingReceiverRequest();
+ request.setAccount(shopAuthentication.getSubMchid());
+ request.setName(shopAuthentication.getBlShopName());
+ ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request);
+ if(StringUtils.isNotBlank(result.getAccount())){
+ shop.setAccountFlag(1);
+ shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ this.saveOrUpdate(shop);
+ }
+ }
+
+ } catch (WxPayException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/29 14:33
+ * @param
+ * @return List<MgtUserTaskMsgVo>
+ */
+ @Override
+ public List<MgtUserTaskMsgVo> getTaskMsgList(){
+ return shopMapper.getTaskMsgList();
+ }
+
+
+ /**
+ * 设置商户分账比例
+ * @param mgtShopShareRatioSetDto
+ * @return
+ */
+ @Override
+ public R setMgtShopShareRatio(MgtShopShareRatioSetDto mgtShopShareRatioSetDto) {
+ ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>()
+ .eq("shop_id", mgtShopShareRatioSetDto.getShopId()).eq("is_delete", 0));
+ shopAuthenticationHftx.setShareRatio(mgtShopShareRatioSetDto.getShareRatio());
+ shopAuthenticationHftxService.updateById(shopAuthenticationHftx);
+ return R.ok();
+ }
+
+
+ /**
+ * 查询结算记录
+ * @param merchantBasicdataSettlementDto
+ * @return
+ */
+ @Override
+ public R<List<MerchantBasicdataSettlementVo>> getMerchantBasicDataSettlement(MerchantBasicdataSettlementDto merchantBasicdataSettlementDto) {
+ ShopAuthenticationHftx shopAuthenticationHftx = shopAuthenticationHftxService.getOne(new QueryWrapper<ShopAuthenticationHftx>()
+ .eq("shop_id", merchantBasicdataSettlementDto.getShopId()).eq("is_delete", 0));
+ if(null == shopAuthenticationHftx){
+ return R.ok(new ArrayList<>());
+ }
+ String huifuId = shopAuthenticationHftx.getHuifuId();
+ String startTime = merchantBasicdataSettlementDto.getStartTime();
+ String endTime = merchantBasicdataSettlementDto.getEndTime();
+ Integer pageNum = merchantBasicdataSettlementDto.getPageNum();
+ Integer pageSize = merchantBasicdataSettlementDto.getPageSize();
+ return HuiFuTianXiaUtil.getMerchantBasicdataSettlement(IdUtils.simpleUUID(), huifuId, startTime, endTime, pageNum.toString(), pageSize.toString());
+ }
+
+
+
+ /**
+ * @description
+ * @author jqs
+ * @date 2023/8/10 22:53
+ * @param cityCodes
+ * @return List<Long>
+ */
+ @Override
+ public List<Shop> listShopByCityCode(List<String> cityCodes){
+ return shopMapper.listShopByCityCode(cityCodes);
+ }
+
+
+ /**
+ * 根据员工id获取对应的门店
+ * @param userIds
+ * @return
+ */
+ @Override
+ public List<Shop> getShopBySysUserIds(List<Long> userIds) {
+ if(null == userIds && userIds.size() == 0){
+ return new ArrayList<>();
+ }
+ QueryWrapper<Shop> queryWrapper = new QueryWrapper<Shop>().eq("del_flag", 0).ne("shop_status", -1);
+ if(null != userIds && userIds.size() > 0){
+ queryWrapper.in("belong_user_id", userIds);
+ }
+ List<Shop> list = this.list(queryWrapper);
+ return list;
+ }
}
--
Gitblit v1.7.1