Commit 2b7787e1 by 程裕兵

feat:list by sub order nos

parent 24659456
......@@ -2,7 +2,9 @@ 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.NotBlank;
import javax.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
......@@ -20,7 +22,7 @@ import lombok.NoArgsConstructor;
public class ListStudioCashierBySubOrderNoRequest {
@ApiModelProperty(value = "子订单号", required = true)
@NotBlank(message = "子订单号不能为空")
private String subOrderNo;
@NotEmpty(message = "子订单号不能为空")
private List<String> subOrderNos;
}
......@@ -110,7 +110,7 @@ public class StudioCashierController implements StudioCashierApi {
@Override
public JsonResult<List<StudioCashierRecordVO>> listBySubOrderNo(
@Valid @RequestBody ListStudioCashierBySubOrderNoRequest request) {
return JsonResult.success(studioCashierService.listBySubOrderNo(request.getSubOrderNo()));
return JsonResult.success(studioCashierService.listBySubOrderNo(request.getSubOrderNos()));
}
@ApiOperation(value = "分页筛选结算记录", tags = {TAG})
......
......@@ -118,9 +118,9 @@ public class StudioCashierRecordRpService extends
return this.findByWrapperPage(wrapper, query.getCurrent(), query.getSize());
}
public List<StudioCashierRecord> listBySubOrderNo(String subOrderNo) {
public List<StudioCashierRecord> listBySubOrderNo(List<String> subOrderNos) {
QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
wrapper.eq(StudioCashierRecord.SUB_ORDER_NO, subOrderNo);
wrapper.in(StudioCashierRecord.SUB_ORDER_NO, subOrderNos);
return this.baseMapper.selectList(wrapper);
}
......
......@@ -57,10 +57,10 @@ public interface StudioCashierService {
/**
* 根据业务子订单号查询列表
*
* @param subOrderNo 业务子订单号
* @param subOrderNos 业务子订单号
* @return 结果
*/
List<StudioCashierRecordVO> listBySubOrderNo(String subOrderNo);
List<StudioCashierRecordVO> listBySubOrderNo(List<String> subOrderNos);
/**
* 分页查询收银流水
......
......@@ -95,8 +95,8 @@ public class StudioCashierServiceImpl implements StudioCashierService {
}
@Override
public List<StudioCashierRecordVO> listBySubOrderNo(String subOrderNo) {
List<StudioCashierRecord> list = studioCashierRecordRpService.listBySubOrderNo(subOrderNo);
public List<StudioCashierRecordVO> listBySubOrderNo(List<String> subOrderNos) {
List<StudioCashierRecord> list = studioCashierRecordRpService.listBySubOrderNo(subOrderNos);
return CashierConvert.convertList(list);
}
......
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