Skip to content

F
fit-finance
Commit ea95e33f by 程裕兵
Options

feat:refund

parent 8fdc6548
Showing with 76 additions and 6 deletions
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApi.java
...@@ -9,6 +9,7 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest; ...@@ -9,6 +9,7 @@ import com.jiejing.fitness.finance.api.cashier.request.GetStudioSettleRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest; 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.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest; import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByTransNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest; import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest; import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest;
import com.jiejing.fitness.finance.api.cashier.request.UnbindStudioCashierRequest; import com.jiejing.fitness.finance.api.cashier.request.UnbindStudioCashierRequest;
...@@ -63,6 +64,10 @@ public interface StudioCashierApi { ...@@ -63,6 +64,10 @@ public interface StudioCashierApi {
@PostMapping(value = "/private/studioCashier/listByIds") @PostMapping(value = "/private/studioCashier/listByIds")
JsonResult<List<StudioCashierRecordVO>> listByIds(ListStudioCashierByIdsRequest request); JsonResult<List<StudioCashierRecordVO>> listByIds(ListStudioCashierByIdsRequest request);
@ApiOperation(value = "查询收银流水详情列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByTransNo")
JsonResult<List<StudioCashierRecordVO>> listByTransNo(ListStudioCashierByTransNoRequest request);
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG}) @ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByOrderNo") @PostMapping(value = "/private/studioCashier/listByOrderNo")
JsonResult<List<StudioCashierRecordVO>> listByOrderNo(ListStudioCashierByOrderNoRequest request); JsonResult<List<StudioCashierRecordVO>> listByOrderNo(ListStudioCashierByOrderNoRequest request);
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/StudioCashierApiFallback.java
...@@ -9,6 +9,7 @@ import com.jiejing.fitness.finance.api.cashier.request.ListRelatedStudioCashierR ...@@ -9,6 +9,7 @@ import com.jiejing.fitness.finance.api.cashier.request.ListRelatedStudioCashierR
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest; 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.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest; import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByTransNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest; import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest; import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest;
import com.jiejing.fitness.finance.api.cashier.request.UnbindStudioCashierRequest; import com.jiejing.fitness.finance.api.cashier.request.UnbindStudioCashierRequest;
...@@ -76,6 +77,12 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp ...@@ -76,6 +77,12 @@ public class StudioCashierApiFallback implements FallbackFactory<StudioCashierAp
} }
@Override @Override
public JsonResult<List<StudioCashierRecordVO>> listByTransNo(
ListStudioCashierByTransNoRequest request) {
return JsonResult.rpcError();
}
@Override
public JsonResult<List<StudioCashierRecordVO>> listByOrderNo( public JsonResult<List<StudioCashierRecordVO>> listByOrderNo(
ListStudioCashierByOrderNoRequest request) { ListStudioCashierByOrderNoRequest request) {
return JsonResult.rpcError(); return JsonResult.rpcError();
......
api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/ListStudioCashierByTransNoRequest.java 0 → 100644
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 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 ListStudioCashierByTransNoRequest {
@ApiModelProperty(value = "收银流水单号", required = true)
@NotEmpty(message = "收银流水单号不能为空")
private List<String> transNos;
}
app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java
...@@ -11,6 +11,7 @@ import com.jiejing.fitness.finance.api.cashier.request.ListRelatedStudioCashierR ...@@ -11,6 +11,7 @@ import com.jiejing.fitness.finance.api.cashier.request.ListRelatedStudioCashierR
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByIdsRequest; 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.ListStudioCashierByOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest; import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierBySubOrderNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.ListStudioCashierByTransNoRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest; import com.jiejing.fitness.finance.api.cashier.request.PageStudioCashierRequest;
import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest; import com.jiejing.fitness.finance.api.cashier.request.PageStudioSettleRequest;
import com.jiejing.fitness.finance.api.cashier.request.UnbindStudioCashierRequest; import com.jiejing.fitness.finance.api.cashier.request.UnbindStudioCashierRequest;
...@@ -108,6 +109,14 @@ public class StudioCashierController implements StudioCashierApi { ...@@ -108,6 +109,14 @@ public class StudioCashierController implements StudioCashierApi {
return JsonResult.success(studioCashierService.listByIds(request.getIds())); return JsonResult.success(studioCashierService.listByIds(request.getIds()));
} }
@ApiOperation(value = "查询收银流水详情列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByTransNo")
@Override
public JsonResult<List<StudioCashierRecordVO>> listByTransNo(
@Valid @RequestBody ListStudioCashierByTransNoRequest request) {
return JsonResult.success(studioCashierService.listByTransNo(request.getTransNos()));
}
@ApiOperation(value = "根据订单号查询收银列表", tags = {TAG}) @ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
@PostMapping(value = "/private/studioCashier/listByOrderNo") @PostMapping(value = "/private/studioCashier/listByOrderNo")
@Override @Override
......
repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java
...@@ -210,4 +210,14 @@ public class StudioCashierRecordRpService extends ...@@ -210,4 +210,14 @@ public class StudioCashierRecordRpService extends
return this.listByRelatedTransNos(payNos).stream() return this.listByRelatedTransNos(payNos).stream()
.collect(Collectors.groupingBy(StudioCashierRecord::getRelatedTransNo)); .collect(Collectors.groupingBy(StudioCashierRecord::getRelatedTransNo));
} }
public List<StudioCashierRecord> listByTransNo(List<String> transNos) {
if (CollectionUtil.isEmpty(transNos)) {
return Lists.newArrayList();
}
QueryWrapper<StudioCashierRecord> wrapper = new QueryWrapper<>();
wrapper.in(StudioCashierRecord.TRANS_NO, transNos);
wrapper.orderByDesc(StudioCashierRecord.ID);
return Optional.ofNullable(this.baseMapper.selectList(wrapper)).orElse(new ArrayList<>(1));
}
} }
service/src/main/java/com/jiejing/fitness/finance/service/cashier/StudioCashierService.java
...@@ -96,6 +96,14 @@ public interface StudioCashierService { ...@@ -96,6 +96,14 @@ public interface StudioCashierService {
List<StudioCashierRecordVO> listByIds(List<Long> ids); List<StudioCashierRecordVO> listByIds(List<Long> ids);
/** /**
* 查询流水集合
*
* @param transNos 单号
* @return 流水
*/
List<StudioCashierRecordVO> listByTransNo(List<String> transNos);
/**
* 查询结算记录 * 查询结算记录
* *
* @param id ID * @param id ID
......
service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java
...@@ -146,11 +146,13 @@ public class StudioCashierServiceImpl implements StudioCashierService { ...@@ -146,11 +146,13 @@ public class StudioCashierServiceImpl implements StudioCashierService {
@Override @Override
public List<StudioCashierRecordVO> listByIds(List<Long> ids) { public List<StudioCashierRecordVO> listByIds(List<Long> ids) {
List<StudioCashierRecord> records = studioCashierRecordRpService.getListByIds(ids); List<StudioCashierRecord> records = studioCashierRecordRpService.getListByIds(ids);
return Optional.ofNullable(records) return CashierConvert.convertList(records);
.orElse(new ArrayList<>()) }
.stream()
.map(CashierConvert::convertVO) @Override
.collect(Collectors.toList()); public List<StudioCashierRecordVO> listByTransNo(List<String> transNos) {
List<StudioCashierRecord> records = studioCashierRecordRpService.listByTransNo(transNos);
return CashierConvert.convertList(records);
} }
@Override @Override
...@@ -164,7 +166,7 @@ public class StudioCashierServiceImpl implements StudioCashierService { ...@@ -164,7 +166,7 @@ public class StudioCashierServiceImpl implements StudioCashierService {
public List<StudioCashierRecordVO> listByRelatedTransNo(String relatedTransNo) { public List<StudioCashierRecordVO> listByRelatedTransNo(String relatedTransNo) {
List<StudioCashierRecord> records = studioCashierRecordRpService.listByRelatedTransNo( List<StudioCashierRecord> records = studioCashierRecordRpService.listByRelatedTransNo(
relatedTransNo); relatedTransNo);
return records.stream().map(CashierConvert::convertVO).collect(Collectors.toList()); return CashierConvert.convertList(records);
} }
} }
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