Commit c50d999f by 程裕兵

feat:list by ids

parent 4ce58790
......@@ -4,6 +4,7 @@ import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
......@@ -53,6 +54,10 @@ public interface StudioCashierApi {
@PostMapping(value = "/private/studioCashier/getById")
JsonResult<StudioCashierRecordVO> getById(GetStudioCashierByIdRequest request);
@ApiOperation(value = "查询收银流水详情列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByIds")
JsonResult<List<StudioCashierRecordVO>> listByIds(ListStudioCashierByIdsRequest request);
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByOrderNo")
JsonResult<List<StudioCashierRecordVO>> listByOrderNo(ListStudioCashierByOrderNoRequest request);
......
......@@ -4,6 +4,7 @@ import com.jiejing.common.model.JsonResult;
import com.jiejing.common.model.PageVO;
import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
......@@ -62,6 +63,11 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp
}
@Override
public JsonResult<List<StudioCashierRecordVO>> listByIds(ListStudioCashierByIdsRequest request) {
return JsonResult.rpcError();
}
@Override
public JsonResult<List<StudioCashierRecordVO>> listByOrderNo(
ListStudioCashierByOrderNoRequest request) {
return JsonResult.rpcError();
......
package com.jiejing.fitness.finance.api.cashier.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.List;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @author chengyubing
* @since 2024/2/29 10:57
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@ApiModel(description = "场馆收银流水查看详情Request")
public class ListStudioCashierByIdsRequest {
@ApiModelProperty(value = "收银流水ID", required = true)
@NotEmpty(message = "收银流水ID不能为空")
private List<Long> ids;
}
......@@ -6,6 +6,7 @@ import com.jiejing.common.utils.convert.BeanUtil;
import com.jiejing.fitness.finance.api.cashier.StudioCashierApi;
import com.jiejing.fitness.finance.api.cashier.request.BindStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.request.GetStudioCashierByIdRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
......@@ -88,6 +89,14 @@ public class StudioCashierController implements StudioCashierApi {
return JsonResult.success(studioCashierService.getById(request.getId()));
}
@ApiOperation(value = "查询收银流水详情列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByIds")
@Override
public JsonResult<List<StudioCashierRecordVO>> listByIds(
@Valid @RequestBody ListStudioCashierByIdsRequest request) {
return JsonResult.success(studioCashierService.listByIds(request.getIds()));
}
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByOrderNo")
@Override
......
......@@ -86,4 +86,12 @@ public interface StudioCashierService {
*/
StudioCashierStatisticVO statistic(PageStudioCashierParams params);
/**
* 查询流水集合
*
* @param ids 流水ID
* @return 流水
*/
List<StudioCashierRecordVO> listByIds(List<Long> ids);
}
......@@ -24,9 +24,12 @@ import com.jiejing.fitness.finance.service.cashier.params.PageStudioSettleParams
import com.jiejing.fitness.finance.service.enums.FinanceErrorEnums;
import com.jiejing.fitness.finance.service.enums.GlobalConfigEnums;
import com.jiejing.paycenter.common.enums.common.PayChannelEnums;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
......@@ -119,4 +122,14 @@ public class StudioCashierServiceImpl implements StudioCashierService {
return studioCashierRecordRpService.statistic(query);
}
@Override
public List<StudioCashierRecordVO> listByIds(List<Long> ids) {
List<StudioCashierRecord> records = studioCashierRecordRpService.getListByIds(ids);
return Optional.ofNullable(records)
.orElse(new ArrayList<>())
.stream()
.map(CashierConvert::convertVO)
.collect(Collectors.toList());
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment