Z四

chengf

2026-01-27 b6184e2ddf3db37a94f7efb3b619bbc64642a292

 service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java

@@ -132,6 +132,8 @@
                                                  @RequestParam(value = "qstartTime", required = false) String qstartTime,
                                                  @RequestParam(value = "qendTime", required = false) String qendTime,
                                                  @RequestParam(value = "feeId", required = false) String feeId,
                                                  @RequestParam(value = "receiptCode", required = false) String receiptCode,

                                                  @RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row,
                                                  @RequestHeader(value = "user_id") String userId) {
@@ -160,6 +162,7 @@
        feeReceiptDto.setStoreName(storeName);
        feeReceiptDto.setPayObjId(payObjId);
        feeReceiptDto.setFeeId(feeId);
        feeReceiptDto.setReceiptCode(receiptCode);
        if (!StringUtil.isEmpty(qstartTime)) {
            feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
        }
@@ -273,6 +276,7 @@
                                                        @RequestParam(value = "receiptIds", required = false) String receiptIds,
                                                        @RequestParam(value = "detailIds", required = false) String detailIds,
                                                        @RequestParam(value = "orderBy", required = false) String orderBy,
                                                        @RequestParam(value = "mergeFee", required = false) String mergeFee,
                                                        @RequestParam(value = "page") int page,
                                                        @RequestParam(value = "row") int row) {
        FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -287,7 +291,13 @@
        if (!StringUtil.isEmpty(detailIds)) {
            feeReceiptDetailDto.setDetailIds(detailIds.split(","));
        }
        return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);

        try {
            return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto, mergeFee);
        }catch (Exception e){
            e.printStackTrace();
            throw e;
        }
    }

}