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:
hucs
2024-07-04 13:38:47 +08:00
parent d2e3108d79
commit d7bf74a95a
3 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,6 @@ import com.starry.admin.modules.order.module.entity.PlayOrderRandomInfoEntity;
import com.starry.admin.modules.order.module.vo.*;
import com.starry.admin.modules.order.service.IPlayOrderInfoService;
import com.starry.admin.modules.order.service.IPlayOrderRandomInfoService;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.system.service.SysRoleService;
import com.starry.common.annotation.Log;
import com.starry.common.context.CustomSecurityContextHolder;
import com.starry.common.enums.BusinessType;
@@ -30,13 +28,6 @@ import java.math.BigDecimal;
public class PlayOrderInfoController {
@Resource
private IPlayOrderInfoService orderInfoService;
@Resource
private SysRoleService sysRoleService;
@Resource
private IPlayPersonnelGroupInfoService playPersonnelGroupInfoService;
@Resource
private IPlayOrderRandomInfoService playOrderRandomInfoService;

3
play-admin/src/main/java/com/starry/admin/modules/order/module/vo/PlayOrderInfoReturnVo.java
View File

@@ -5,6 +5,7 @@ import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
* 订单查询返回对象
@@ -181,6 +182,8 @@ public class PlayOrderInfoReturnVo {
*/
private String backendRemark;
private List<String> labels;
}

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

@@ -15,15 +15,9 @@ import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
import com.starry.admin.modules.order.mapper.PlayOrderInfoMapper;
import com.starry.admin.modules.order.module.constant.OrderConstant;
import com.starry.admin.modules.order.module.entity.PlayOrderComplaintInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderEvaluateInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
import com.starry.admin.modules.order.module.entity.PlayOrderRefundInfoEntity;
import com.starry.admin.modules.order.module.entity.*;
import com.starry.admin.modules.order.module.vo.*;
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.order.service.*;
import com.starry.admin.modules.personnel.service.IPlayPersonnelGroupInfoService;
import com.starry.admin.modules.weichat.entity.order.*;
import com.starry.admin.utils.SecurityUtils;
@@ -39,10 +33,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;
@@ -59,24 +50,20 @@ import static com.starry.admin.modules.order.module.constant.OrderConstant.ORDER
public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, PlayOrderInfoEntity> implements IPlayOrderInfoService {
@Resource
private PlayOrderInfoMapper orderInfoMapper;
@Resource
private IPlayClerkUserInfoService playClerkUserInfoService;
@Resource
private IPlayCustomUserInfoService userInfoService;
@Resource
private IPlayOrderRefundInfoService playOrderRefundInfoService;
@Resource
private IPlayOrderEvaluateInfoService playOrderEvaluateInfoService;
@Resource
private IPlayOrderComplaintInfoService playOrderComplaintInfoService;
@Resource
private IPlayPersonnelGroupInfoService playClerkGroupInfoService;
@Resource
private IPlayOrderRandomInfoService playOrderRandomInfoService;
@Override
@@ -407,8 +394,16 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
lambdaQueryWrapper.in(PlayOrderInfoEntity::getAcceptBy, clerkIdList);
return this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper);
Page<PlayOrderInfoReturnVo> page = this.baseMapper.selectJoinPage(new Page<>(vo.getPageNum(), vo.getPageSize()), PlayOrderInfoReturnVo.class, lambdaQueryWrapper);
page.getRecords().forEach(ca -> {
if (ca.getPlaceType().equals("1")) {
PlayOrderRandomInfoEntity randomInfo = playOrderRandomInfoService.getById(ca.getId());
if (Objects.nonNull(randomInfo)) {
ca.setLabels(randomInfo.getLabels());
}
}
});
return page;
}