From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 640 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 536 insertions(+), 104 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 ac16539..bd49c96 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
@@ -2,6 +2,7 @@
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;
@@ -12,6 +13,7 @@
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.StringUtils;
@@ -24,23 +26,33 @@
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.domain.vo.MgtShopPageVo;
import com.ruoyi.shop.enums.WxApplyMentStateEnum;
import com.ruoyi.shop.mapper.shop.ShopMapper;
import com.ruoyi.shop.service.shop.*;
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.OneClinkSyncing;
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.shop.ShopAppointableTime;
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.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -59,7 +71,7 @@
* @since 2023-04-25
*/
@Service
-@Slf4j
+@Log4j2
public class ShopServiceImpl extends ServiceImpl<ShopMapper, Shop> implements ShopService {
@Resource
@@ -99,6 +111,9 @@
private ShopAuthenticationService shopAuthenticationService;
@Resource
+ private ShopAuthenticationHftxService shopAuthenticationHftxService;
+
+ @Resource
private ShopProportionService shopProportionService;
@Resource
@@ -124,18 +139,23 @@
@Resource
private RedisService redisService;
-
+
@Resource
private WechatPayUtils wechatPayUtils;
-
+
@Resource
private ShopDetailService shopDetailService;
-
+
@Resource
private RemoteUserService remoteUserService;
-
-
-
+
+ @Resource
+ private ShopAppointableTimeService shopAppointableTimeService;
+
+ @Value("${callback_path}")
+ private String callback_path;
+
+
/**
* 获取商户详情
*
@@ -171,47 +191,48 @@
}
return appShopInfoVo;
}
-
+
/**
* 创建商户
+ *
* @param mgtEditShopDto
*/
@Override
- public void createShop(MgtEditShopDto mgtEditShopDto){
+ public void createShop(MgtEditShopDto mgtEditShopDto) {
Shop shop = new Shop();
Boolean newShop = false;
BigDecimal zeroBig = BigDecimal.ZERO;
//验证关联账号唯一
String relUserIds = mgtEditShopDto.getRelUserIds();
- if(StringUtils.isNotBlank(relUserIds)) {
- if(relUserIds.startsWith(",")){
- relUserIds = relUserIds.substring(1);
- }
- String[] relUserIdArray = relUserIds.split(",");
- ShopRelUser shopRelUser;
- Long userId;
- if(mgtEditShopDto.getShopId()!=null){
- for (String str : relUserIdArray) {
- userId = Long.valueOf(str);
- shopRelUser = shopRelUserService.getByUserId(userId);
- if(shopRelUser!=null&&!shopRelUser.getShopId().equals(mgtEditShopDto.getShopId())){
- throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
- }
- }
- }else {
- for (String str : relUserIdArray) {
- userId = Long.valueOf(str);
- shopRelUser = shopRelUserService.getByUserId(userId);
- if(shopRelUser!=null){
- throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
- }
- }
- }
-
- }
+// if(StringUtils.isNotBlank(relUserIds)) {
+// if(relUserIds.startsWith(",")){
+// relUserIds = relUserIds.substring(1);
+// }
+// String[] relUserIdArray = relUserIds.split(",");
+// ShopRelUser shopRelUser;
+// Long userId;
+// if(mgtEditShopDto.getShopId()!=null){
+// for (String str : relUserIdArray) {
+// userId = Long.valueOf(str);
+// shopRelUser = shopRelUserService.getByUserId(userId);
+// if(shopRelUser!=null&&!shopRelUser.getShopId().equals(mgtEditShopDto.getShopId())){
+// throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
+// }
+// }
+// }else {
+// for (String str : relUserIdArray) {
+// userId = Long.valueOf(str);
+// shopRelUser = shopRelUserService.getByUserId(userId);
+// if(shopRelUser!=null){
+// throw new ServiceException(AppErrorConstant.SHOP_USER_DOUBLE);
+// }
+// }
+// }
+//
+// }
//验证商户名唯一
//Shop shopSame = this.getOne(new LambdaQueryWrapper<Shop>().eq(Shop::getDelFlag,0).eq(Shop::getShopName,mgtEditShopDto.getShopName()));
- if(mgtEditShopDto.getShopId()!=null){
+ if (mgtEditShopDto.getShopId() != null) {
//取消验重
/*if(shopSame!=null&&!Objects.equals(shopSame.getShopId(),mgtEditShopDto.getShopId())){
throw new ServiceException(AppErrorConstant.SHOP_DOUBLE);
@@ -224,8 +245,17 @@
shopFileService.deleteByShopId(shop.getShopId());
shopRelTagService.deleteByShopId(shop.getShopId());
shopRelUserService.deleteByShopId(shop.getShopId());
+ //默认登录账号开关 开启后原默认账号开关关闭
+ List<Long> openIdList = Arrays.stream(mgtEditShopDto.getRelUserOpenIds().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ if ( !openIdList.isEmpty()) {
+ shopRelUserService.setDefaultCloseByUserIdList(openIdList);
+ }
+
//清空归属
- shopRelUserService.deleteByShopId(shop.getShopId());
shopStaffService.clearShopStaffRelation(shop.getShopId());
if(!shop.getShopName().equals(mgtEditShopDto.getShopName())){
MgtMemberShopNameDto mgtMemberShopNameDto = new MgtMemberShopNameDto();
@@ -245,6 +275,7 @@
shop.setFrozenFlag(0);
shop.setCooperativeFlag(1);
shop.setAuthFlag(0);
+ shop.setAccountFlag(0);
newShop = true;
}
BeanUtils.copyProperties(mgtEditShopDto,shop);
@@ -287,6 +318,7 @@
handleShopStaff(shop.getShopId(),belongSysUser);
}*/
//商户关联人员
+ String[] openIds = mgtEditShopDto.getRelUserOpenIds().split(",");//开启默认登录账号
if(StringUtils.isNotBlank(relUserIds)){
shopStaffService.clearShopStaffRelation(shop.getShopId());
String[] relUserIdArray = relUserIds.split(",");
@@ -303,6 +335,7 @@
shopRelUser.setUserName(sysUser.getNickName());
shopRelUser.setUserMobile(sysUser.getPhonenumber());
shopRelUser.setUserDeptId(sysUser.getDeptId());
+ shopRelUser.setIsDefault((openIds.length > 0 && Arrays.asList(openIds).contains(str)) ? 1 : 0);
shopRelUserService.save(shopRelUser);
handleShopStaff(shop.getShopId(),sysUser);
}
@@ -374,7 +407,12 @@
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);
@@ -437,7 +475,7 @@
}else{
shop.setCooperativeFlag(0);
}
- shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ shop.setShopStatus(handelShopStatus(null,shop.getCooperativeFlag(), null));
shop.setUpdateTime(new Date());
shop.setUpdateUserId(mgtTerminateCooperationDto.getUserId());
this.saveOrUpdate(shop);
@@ -458,7 +496,7 @@
}else{
shop.setFrozenFlag(0);
}
- shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag()));
+ shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(), null, null));
this.saveOrUpdate(shop);
}
@@ -471,16 +509,16 @@
*/
private Integer handelShopStatus(Integer frozenFlag, Integer cooperativeFlag, Integer authFlag){
Integer shopStatus = 1;
- if(frozenFlag == 1){
+ if(null != frozenFlag && frozenFlag == 1){
shopStatus = 0;
return shopStatus;
}
- if(authFlag == 0){
- shopStatus = 3;
+ if(null != cooperativeFlag && cooperativeFlag == 0){
+ shopStatus = 2;
return shopStatus;
}
- if(cooperativeFlag == 0){
- shopStatus = 2;
+ if(null != authFlag && authFlag == 0){
+ shopStatus = 3;
return shopStatus;
}
return shopStatus;
@@ -527,12 +565,16 @@
* @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<Integer> associatedAccount = null;
+ if(StringUtils.isNotEmpty(mgtShopPageDto.getAssociatedAccount())){
+ associatedAccount = Arrays.asList(mgtShopPageDto.getAssociatedAccount().split(",")).stream().map(Integer::valueOf).collect(Collectors.toList());
+ }
// 分页查询商铺信息
- List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto);
+ List<MgtShopPageVo> mgtShopPageVoList = shopMapper.pageMgtShop(page, mgtShopPageDto,scope, associatedAccount);
// 如果查询结果不为空
if (!mgtShopPageVoList.isEmpty()) {
// 创建签约用户ID集合和所属用户ID集合
@@ -574,8 +616,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());
}
}
}
@@ -628,12 +671,17 @@
if(shopRelUserList!=null&&!shopRelUserList.isEmpty()){
StringJoiner shopUserJs = new StringJoiner(",");
StringJoiner shopUserNameJs = new StringJoiner(",");
+ StringJoiner relUserOpenIds = new StringJoiner(",");
for(ShopRelUser shopRelUser : shopRelUserList){
shopUserJs.add(shopRelUser.getUserId().toString());
shopUserNameJs.add(shopRelUser.getUserName());
+ if (shopRelUser.getIsDefault()==1){
+ relUserOpenIds.add(shopRelUser.getUserId().toString());
+ }
}
mgtShopInfoVo.setRelUserIds(shopUserJs.toString());
mgtShopInfoVo.setRelUsers(shopUserNameJs.toString());
+ mgtShopInfoVo.setRelUserOpenIds(relUserOpenIds.toString());
}
//商户图片
List<ShopFile> shopFileList = shopFileService.listShopFileByShopId(shopId);
@@ -710,7 +758,6 @@
shopTransferRecord.setAfterUserId(mgtTransferShopDto.getTransferUserId());
shopTransferRecord.setTransferRemark(mgtTransferShopDto.getTransferRemark());
shopTransferRecordService.save(shopTransferRecord);
- shopRelUserService.deleteByUserId(shop.getBelongUserId());
}
shop.setBelongUserId(mgtTransferShopDto.getTransferUserId());
this.saveOrUpdate(shop);
@@ -739,8 +786,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;
}
@@ -797,7 +868,43 @@
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();
@@ -810,8 +917,8 @@
}
userIds.add(userId);
}
- }else {
- //普通员工查询商户归属的shopId
+ }
+ if(dataScopeEmployee.equals("5")){
List<Shop> shopList = this.getShopByBelongUserId(userId);
if(shopList!=null&&!shopList.isEmpty()){
for(Shop shop : shopList){
@@ -820,47 +927,39 @@
userIds.add(userId);
}
}
+
//分别查询
- StaffHomeShopTotalVo staffHomeShopTotalVo = new StaffHomeShopTotalVo();
- if(userIds!=null&&!userIds.isEmpty()){
- staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
- }else{
- staffHomeShopTotalVo.setShopTotal(0);
- staffHomeShopTotalVo.setAgencyTotal(0);
- staffHomeShopTotalVo.setDealerTotal(0);
- }
- Integer shopTaskCount = 0;
- if(shopIds!=null&&!shopIds.isEmpty()){
- shopTaskService.getShopIngTotal(shopIds);
- }
+ StaffHomeShopTotalVo staffHomeShopTotalVo = shopMapper.getStaffHomeTotal(userIds);
+ Integer shopTaskCount = shopTaskService.getShopIngTotal(shopIds);
staffHomeShopTotalVo.setFollowMember(0);
staffHomeShopTotalVo.setNewMember(0);
staffHomeShopTotalVo.setShopTask(shopTaskCount);
return staffHomeShopTotalVo;
}
+
/**
* 获取商户端
+ *
* @param merBaseDto
* @return
*/
@Override
- public MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto){
+ public MerHomeShopTotalVo getMerHomeTotal(MerBaseDto merBaseDto) {
Long userId = merBaseDto.getUserId();
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
- ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
- Long shopId = shopRelUser.getShopId();
+ Long shopId = merBaseDto.getShopId();
//如果商户变动刷新token
- if(!shopId.equals(merBaseDto.getShopId())){
- String userKey = SecurityUtils.getUserKey();
- redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
- throw new ServiceException("登录状态已过期",401);
- }
+// if(!shopId.equals(merBaseDto.getShopId())){
+// String userKey = SecurityUtils.getUserKey();
+// redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
+// throw new ServiceException("登录状态已过期",401);
+// }
merHomeShopTotalVo.setShopId(shopId);
Shop shop = this.getById(shopId);
- if(shop.getFrozenFlag()==1){
+ if (shop.getFrozenFlag() == 1) {
String userKey = SecurityUtils.getUserKey();
- redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY+userKey);
- throw new ServiceException("商户已被冻结,请联系管理员",401);
+ redisService.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + userKey);
+ throw new ServiceException("商户已被冻结,请联系管理员", 401);
}
merHomeShopTotalVo.setShopType(shop.getShopType());
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
@@ -875,6 +974,8 @@
merHomeShopTotalVo.setExplorationSurp(orderVo.getExplorationSurp());
merHomeShopTotalVo.setPlatformBirthdayFlag(shop.getPlatformBirthdayFlag());
merHomeShopTotalVo.setPlatformCouponFlag(shop.getPlatformCouponFlag());
+ int unHandleReserve = shopAppointableTimeService.count(new LambdaQueryWrapper<ShopAppointableTime>().eq(ShopAppointableTime::getShopId, shopId).eq(ShopAppointableTime::getStatus, 1));
+ merHomeShopTotalVo.setUnHandleReserve(unHandleReserve);
return merHomeShopTotalVo;
}
@@ -967,8 +1068,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);
}
/**
@@ -1005,8 +1106,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);
}
/**
@@ -1017,8 +1130,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;
}
@@ -1030,7 +1143,7 @@
* @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());
@@ -1058,6 +1171,92 @@
shopAuthenticationService.saveOrUpdate(shopAuthentication);
}
+
+ /**
+ * 商户进件（汇付天下）
+ * @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 获取平台商户统计
* @author jqs
@@ -1074,7 +1273,7 @@
userIdList.add(mgtBasePlatformDto.getUserId());
} else {
MgtUserIdByDept mgtUserIdByDept = new MgtUserIdByDept();
- mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getUserId());
+ mgtUserIdByDept.setDeptId(mgtBasePlatformDto.getDeptId());
mgtUserIdByDept = configService.getUserIdByDept(mgtUserIdByDept).getData();
userIdList = mgtUserIdByDept.getUserIdList();
}
@@ -1082,8 +1281,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()) {
@@ -1196,6 +1407,23 @@
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;
+ }
+
/**
* @description 获取商户验证信息
* @author jqs
@@ -1247,19 +1475,19 @@
}).collect(Collectors.toList());
return simpleShopVoList;
}
-
+
/**
- * @description 获取用户管理商户
- * @author jqs
- * @date 2023/7/14 10:00
* @param userId
- * @return Shop
+ * @return Shop
+ * @description 获取用户管理商户
+ * @author jqs
+ * @date 2023/7/14 10:00
*/
@Override
- public List<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);
+ queryWrapper.eq(Shop::getDelFlag, 0);
+ queryWrapper.eq(Shop::getBelongUserId, userId);
return this.list(queryWrapper);
}
@@ -1287,17 +1515,37 @@
@Override
public StaffShopSimpleTotalVo getStaffSimpleTotal(Long userId){
List<Long> userIdList = new ArrayList<>();
- if(remoteSysStaffService.isLeader()){
+// 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);
}
+
StaffShopSimpleTotalVo shopTotal = shopMapper.getStaffSimpleTotal(1,userIdList);
StaffShopSimpleTotalVo agencyTotal = shopMapper.getStaffSimpleTotal(2,userIdList);
shopTotal.setAgencyTotal(agencyTotal.getShopTotal());
shopTotal.setOpenAgencyTotal(agencyTotal.getOpenShopTotal());
- shopTotal.setCloseAgencyTotal(agencyTotal.getCloseAgencyTotal());
+ shopTotal.setCloseAgencyTotal(agencyTotal.getCloseShopTotal());
return shopTotal;
}
@@ -1454,6 +1702,23 @@
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);
+ }
+ }
+ }
}
/**
@@ -1483,13 +1748,17 @@
private void applySuccessUpdateShopStatus(Long shopId){
// 更新商户状态为正常
Shop shop = this.getById(shopId);
- Integer shopStatus = handelShopStatus(shop.getFrozenFlag(), shop.getCooperativeFlag(), 1);
+ Integer shopStatus = handelShopStatus(null, null, 1);
LambdaUpdateWrapper<Shop> updateWrapper = Wrappers.lambdaUpdate();
updateWrapper.eq(Shop::getShopId, shopId)
.set(Shop::getShopStatus, shopStatus)
.set(Shop::getAuthFlag, 1);
this.update(updateWrapper);
}
+
+
+
+
/**
* @description
@@ -1593,17 +1862,29 @@
/**
- * @description
+ * @description 添加分账方
* @author jqs
* @date 2023/8/23 9:44
* @param
* @return void
*/
@Override
- public ProfitSharingReceiverResult addProfitSharingReceiver(ProfitSharingReceiverRequest request){
+ public void addProfitSharingReceiver(MgtShopAuthGetDto mgtShopAuthGetDto){
try {
- ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request);
- return result;
+ 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(null , null,shop.getAuthFlag()));
+ this.saveOrUpdate(shop);
+ }
+ }
+
} catch (WxPayException e) {
throw new RuntimeException(e);
}
@@ -1623,4 +1904,155 @@
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;
+ }
+
+ @Override
+ public List<Shop> getFranchiseeIdsBYDealerId(Long shopId) {
+ return shopMapper.getFranchiseeIdsBYDealerId(shopId);
+ }
+
+ /**
+ * 修改商户类型
+ * @param shopId
+ * @return
+ */
+ @Override
+ public R<Void> changeShopType(Long shopId) {
+ Shop shop = shopMapper.selectById(shopId);
+ if(null == shop|| shop.getDelFlag() != 0){
+ return R.fail("商户不存在");
+ }
+ //商户修改类型 1-经销商 2-加盟商
+ shop.setShopType(shop.getShopType()==1?2:1);
+ if (shop.getShopType()==2){
+ //经销商转加盟商： 先解绑该经销商下所有加盟商
+ shopMapper.setBelongShopIdNull(shopId);
+ }
+ shop.setUpdateUserId(SecurityUtils.getUserId());
+ shopMapper.updateById(shop);
+
+ return R.ok();
+ }
+
+ @Override
+ public Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(MGtOneClinkSyncingShopPageDTO dto) {
+ Page<MgtOneClinkSyncingShopPageVo> page = new Page<>();
+ page.setSize(dto.getPageSize());
+ page.setCurrent(dto.getPageNum());
+ List<MgtOneClinkSyncingShopPageVo> mgtShopPageVoList = shopMapper.getMgtShopPageVoByShopIds(page,dto.getShopIds());
+ return page.setRecords(mgtShopPageVoList);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing) {
+ if (StringUtils.isBlank(oneClinkSyncing.getShopIds())) {
+ return R.fail("请选择要更新的门店");
+ }
+ // 1. 转换门店ID列表
+ List<Long> shopIdList = Arrays.stream(oneClinkSyncing.getShopIds().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .map(Long::parseLong)
+ .collect(Collectors.toList());
+ // 批量删除封面和Banner图
+ shopFileService.deleteBatchByShopIds(shopIdList);
+ //批量添加封面图
+ List<ShopFile> coverUrlList = shopIdList.stream()
+ .map(shopId -> new ShopFile()
+ .setShopId(shopId)
+ .setFileType(1)
+ .setFileUrl(oneClinkSyncing.getCoverUrl())
+ .setDelFlag(0))
+ .collect(Collectors.toList());
+ shopFileService.saveBatch(coverUrlList);
+ //批量添加banner图
+ List<String> bannerUrlList = Arrays.stream(oneClinkSyncing.getDetailsPicture().split(","))
+ .map(String::trim)
+ .filter(StringUtils::isNotBlank)
+ .collect(Collectors.toList());
+ List<ShopFile> bannerList = new ArrayList<>();
+ for (Long shopId : shopIdList) {
+ for (String bannerUrl : bannerUrlList) {
+ bannerList.add(new ShopFile()
+ .setShopId(shopId)
+ .setFileType(2) // Banner图
+ .setFileUrl(bannerUrl)
+ .setDelFlag(0));
+ }
+ }
+ shopFileService.saveBatch(coverUrlList);
+
+ //批量修改门店信息
+ oneClinkSyncing.setShopIdList(shopIdList);
+ shopMapper.updateShopByOneClinkSyncing(oneClinkSyncing);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1