Z四

chengf

2026-01-27 b6184e2ddf3db37a94f7efb3b619bbc64642a292

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

@@ -1,9 +1,9 @@
package com.java110.fee.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeReceipt.FeeReceiptDto;
import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.fee.FeeReceiptDto;
import com.java110.dto.fee.FeeReceiptDtoNew;
import com.java110.dto.fee.FeeReceiptDetailDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
@@ -14,8 +14,8 @@
import com.java110.fee.bmo.feeReceiptDetail.ISaveFeeReceiptDetailBMO;
import com.java110.fee.bmo.feeReceiptDetail.IUpdateFeeReceiptDetailBMO;
import com.java110.intf.store.IStoreInnerServiceSMO;
import com.java110.po.feeReceipt.FeeReceiptPo;
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import com.java110.po.fee.FeeReceiptPo;
import com.java110.po.fee.FeeReceiptDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -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");
        }
@@ -272,6 +275,8 @@
                                                        @RequestParam(value = "receiptId", required = false) String receiptId,
                                                        @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();
@@ -279,13 +284,20 @@
        feeReceiptDetailDto.setRow(row);
        feeReceiptDetailDto.setCommunityId(communityId);
        feeReceiptDetailDto.setReceiptId(receiptId);
        feeReceiptDetailDto.setOrderBy(orderBy);
        if (!StringUtil.isEmpty(receiptIds)) {
            feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
        }
        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;
        }
    }

}