cgf
2025-08-09 569bd97e623c596ac2db49aa65c88966380b6562
service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
@@ -5,7 +5,7 @@
import com.java110.dto.fee.FeeDiscountDto;
import com.java110.dto.fee.FeeDiscountRuleDto;
import com.java110.dto.fee.FeeDiscountRuleSpecDto;
import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.dto.payFee.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeDiscount.IDeleteFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscount.ISaveFeeDiscountBMO;
@@ -13,9 +13,11 @@
import com.java110.fee.bmo.feeDiscountRule.IGetFeeDiscountRuleBMO;
import com.java110.fee.bmo.feeDiscountRuleSpec.IComputeFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscountRuleSpec.IGetFeeDiscountRuleSpecBMO;
import com.java110.po.feeDiscount.FeeDiscountPo;
import com.java110.po.fee.FeeDiscountPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
@@ -190,8 +192,22 @@
                                                     @RequestParam(value = "payerObjId") String payerObjId,
                                                     @RequestParam(value = "payerObjType") String payerObjType,
                                                     @RequestParam(value = "endTime") String endTime,
                                                     @RequestParam(value = "custEndTime",required = false) String custEndTime,
                                                     @RequestParam(value = "custStartTime",required = false) String custStartTime,
                                                     @RequestParam(value = "page") int page,
                                                     @RequestParam(value = "row") int row) throws ParseException {
//        custEndTime = "2025-12-20";
//        custStartTime = "2025-12-11";
        if (cycles == 105){
            if(custStartTime == null){
                throw new IllegalArgumentException("请选择开始时间");
            }
            if(custEndTime == null){
                throw new IllegalArgumentException("请选择结束时间");
            }
            cycles = DateUtil.dayCompare(DateUtil.getDateFromStringB(custStartTime), DateUtil.getDateFromStringB(custEndTime));
            return computeFeeDiscountBMOImpl.compute(feeId, communityId, cycles, payerObjId, payerObjType, custStartTime, page, row, custEndTime);
        }
        return computeFeeDiscountBMOImpl.compute(feeId, communityId, cycles, payerObjId, payerObjType, endTime, page, row);
    }