irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-06-25 22:11:27 +08:00
parent 6e40e7b8ee
commit 5a12ca5146
8 changed files with 69 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/common/task/OrderRankingSettlementTask.java
View File

@@ -128,7 +128,7 @@ public class OrderRankingSettlementTask {
* @since 2024/6/7 11:43
**/
public PlayClerkRankingInfoEntity getClerkRanking(String clerkId, String startTime, String endTime, String weeklyRanking, Integer serialNumber) {
List<PlayOrderInfoEntity> orderInfoEntities = orderInfoService.listByTime(clerkId, startTime, endTime);
List<PlayOrderInfoEntity> orderInfoEntities = orderInfoService.listByTime(clerkId, startTime, endTime,null);
int orderNumber = orderInfoEntities.size();
BigDecimal orderMoney = BigDecimal.ZERO;
Integer orderContinueNumber = 0;

9
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkRankingInfoServiceImpl.java
View File

@@ -10,9 +10,11 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.starry.admin.modules.clerk.mapper.PlayClerkRankingInfoMapper;
import com.starry.admin.modules.clerk.module.entity.*;
import com.starry.admin.modules.clerk.service.IPlayClerkRankingInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.weichat.entity.order.PlayOrderHistoryRankingReturnVo;
import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingListVo;
import com.starry.admin.modules.weichat.entity.order.PlayOrderRankingReturnVo;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.IdUtils;
import org.springframework.stereotype.Service;
@@ -32,6 +34,9 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl<PlayClerkRankin
@Resource
private PlayClerkRankingInfoMapper playClerkRankingInfoMapper;
@Resource
private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
@Override
public IPage<IPlayClerkRankingInfoReturnVo> selectByPage(IPlayClerkRankingInfoQueryVo vo) {
@@ -55,6 +60,10 @@ public class PlayClerkRankingInfoServiceImpl extends ServiceImpl<PlayClerkRankin
if (vo.getSettlementDate() != null) {
lambdaQueryWrapper.eq(PlayClerkRankingInfoEntity::getSettlementDate, vo.getSettlementDate());
}
// 加入组员的筛选
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
lambdaQueryWrapper.orderByAsc(PlayClerkRankingInfoEntity::getRankingIndex);
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), IPlayClerkRankingInfoReturnVo.class, lambdaQueryWrapper);
}

3
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java
View File

@@ -289,6 +289,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
if (StrUtil.isNotBlank(vo.getListingState())) {
lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getListingState, vo.getListingState());
}
// 加入组员的筛选
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
return this.baseMapper.selectPage(new Page<>(vo.getPageNum(), vo.getPageSize()), lambdaQueryWrapper);
}

10
play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserReviewInfoServiceImpl.java
View File

@@ -16,12 +16,15 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserReviewStateEditVo;
import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
import com.starry.admin.modules.clerk.service.IPlayClerkUserReviewInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.IdUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
/**
* 店员资料审核Service业务层处理
@@ -37,6 +40,10 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl<PlayClerkUse
@Resource
private IPlayClerkUserInfoService playClerkUserInfoService;
@Resource
private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
@Resource
private IPlayClerkCommodityService clerkCommodityService;
@@ -90,6 +97,9 @@ public class PlayClerkUserReviewInfoServiceImpl extends ServiceImpl<PlayClerkUse
if (StrUtil.isNotBlank(vo.getWeiChatCode())) {
lambdaQueryWrapper.like(PlayClerkUserReviewInfoEntity::getWeiChatCode, vo.getWeiChatCode());
}
// 加入组员的筛选
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
lambdaQueryWrapper.in(PlayClerkUserInfoEntity::getId, clerkIdList);
lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getAddTime);
lambdaQueryWrapper.orderByDesc(PlayClerkUserReviewInfoEntity::getClerkId);
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayClerkUserReviewReturnVo.class, lambdaQueryWrapper);

27
play-admin/src/main/java/com/starry/admin/modules/order/controller/PlayOrderInfoController.java
View File

@@ -19,6 +19,10 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
@@ -48,20 +52,21 @@ public class PlayOrderInfoController {
*/
@PostMapping("/listByPage")
public R listByPage(@Validated @RequestBody PlayOrderInfoQueryVo vo) {
//查询当前登录用户所有角色信息
for (String role : SecurityUtils.getLoginUser().getRoles()) {
SysRoleEntity entity = sysRoleService.selectByRoleId(role);
if (entity == null) {
continue;
}
//如果当前登录用户的身份是组长
if ("leader".equals(entity.getRoleKey())) {
vo.setGroupId(playPersonnelGroupInfoService.selectByUserId(SecurityUtils.getUserId()).getId());
}
}
return R.ok(orderInfoService.selectOrderInfoPage(vo));
}
/**
* 查询7天内, 已完成 和 进行中的订单
* 然后进行统计
*/
@PostMapping("/listByTime")
public R listByTime(@Validated @RequestBody PlayOrderComplaintQueryVo vo) {
String startTime = "2024-06-24 00:00:00";
String nedTime = "2024-06-24 00:00:00";
List<PlayOrderInfoEntity> list = orderInfoService.listByTime("", startTime, nedTime, Stream.of("2","3").collect(Collectors.toList()));
return R.ok(list);
}
/**
* 订单退款

3
play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java
View File

@@ -119,9 +119,10 @@ public interface IPlayOrderInfoService extends IService<PlayOrderInfoEntity> {
* @param clerkId 店员ID
* @param startTime 开始时间
* @param endTime 结束时间
* @param orderStatus 店员状态列表
* @return List<PlayOrderInfoEntity>
*/
List<PlayOrderInfoEntity> listByTime(String clerkId, String startTime, String endTime);
List<PlayOrderInfoEntity> listByTime(String clerkId, String startTime, String endTime, List<String> orderStatus);
/**
* 分页查询打赏订单

28
play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java
View File

@@ -24,7 +24,9 @@ import com.starry.admin.modules.order.service.IPlayOrderComplaintInfoService;
import com.starry.admin.modules.order.service.IPlayOrderEvaluateInfoService;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.order.service.IPlayOrderRefundInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.weichat.entity.order.*;
import com.starry.admin.utils.SecurityUtils;
import com.starry.common.utils.ConvertUtil;
import com.starry.common.utils.IdUtils;
import com.starry.common.utils.StringUtils;
@@ -37,10 +39,7 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.*;
import java.util.stream.Collectors;
import static com.starry.admin.modules.order.module.constant.OrderConstant.ORDER_STATUS_2;
@@ -74,6 +73,10 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
private IPlayOrderComplaintInfoService playOrderComplaintInfoService;
@Resource
private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
@Override
public List<PlayOrderInfoEntity> getTotalOrderInfo(String tenantId) {
MPJLambdaWrapper<PlayOrderInfoEntity> lambdaWrapper = new MPJLambdaWrapper<>();
@@ -266,10 +269,16 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
}
@Override
public List<PlayOrderInfoEntity> listByTime(String clerkId, String startTime, String endTime) {
public List<PlayOrderInfoEntity> listByTime(String clerkId, String startTime, String endTime, List<String> orderStatus) {
MPJLambdaWrapper<PlayOrderInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId);
if (StrUtil.isNotEmpty(clerkId)) {
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId);
}
if (orderStatus != null) {
lambdaQueryWrapper.in(PlayOrderInfoEntity::getOrderStatus, new ArrayList<>());
}
lambdaQueryWrapper.between(PlayOrderInfoEntity::getAcceptTime, startTime, endTime);
return this.baseMapper.selectList(lambdaQueryWrapper);
}
@@ -368,6 +377,7 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
*/
@Override
public IPage<PlayOrderInfoReturnVo> selectOrderInfoPage(PlayOrderInfoQueryVo vo) {
MPJLambdaWrapper<PlayOrderInfoEntity> lambdaQueryWrapper = getCommonOrderQueryVo(ConvertUtil.entityToVo(vo, PlayOrderInfoEntity.class));
if (StringUtils.isNotBlank(vo.getGroupId())) {
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getGroupId, vo.getGroupId());
@@ -387,6 +397,12 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
if (StringUtils.isNotBlank(vo.getOrderType())) {
lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderType, vo.getOrderType());
}
// 加入组员的筛选
List<String> clerkIdList = playClerkGroupInfoService.getValidClerkIdList(SecurityUtils.getLoginUser());
lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList);
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper);
}

6
play-admin/src/main/java/com/starry/admin/modules/personnel/service/IPlayPersonnelGroupInfoService.java
View File

@@ -83,5 +83,11 @@ public interface IPlayPersonnelGroupInfoService extends IService<PlayPersonnelGr
*/
void deletePlayClerkGroupInfoById(String id);
/**
* 筛选所有的组员
*
* @param loginUser 登录用户
* @return 组员ID列表
*/
List<String> getValidClerkIdList(LoginUser loginUser);
}