折扣逻辑修改2025/08/08

chengf

2025-08-08 7a095e5d59a428225caca81738a69603578964a3

折扣逻辑修改2025/08/08

 java110-bean/src/main/java/com/java110/dto/contract/ContractPartyaDto.java

@@ -20,6 +20,7 @@
    private String aContacts;
    private String partyaId;
    private String storeId;
    private String typeId;


    private Date createTime;
@@ -82,4 +83,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getTypeId() {
        return typeId;
    }

    public void setTypeId(String typeId) {
        this.typeId = typeId;
    }
}

 java110-bean/src/main/java/com/java110/dto/owner/OwnerCarDto.java

@@ -1,5 +1,6 @@
package com.java110.dto.owner;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.java110.dto.PageDto;

import java.io.Serializable;
@@ -70,8 +71,9 @@
    private String spaceSate;

    private String roomName;

    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date startTime;
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date endTime;
    private String state;
    private String stateName;

 java110-bean/src/main/java/com/java110/po/contract/ContractPartyaPo.java

@@ -10,7 +10,7 @@
    private String partyaId;
    private String statusCd = "0";
    private String storeId;

    private String typeId;

    public String getPartyA() {
        return partyA;
@@ -59,4 +59,12 @@
    public void setStoreId(String storeId) {
        this.storeId = storeId;
    }

    public String getTypeId() {
        return typeId;
    }

    public void setTypeId(String typeId) {
        this.typeId = typeId;
    }
}

 java110-bean/src/main/java/com/java110/po/contract/ContractPo.java

@@ -17,6 +17,9 @@
    private String partyA;
    private String bLink;
    private String partyB;
    private String partyC;
    private String cLink;
    private String cContacts;
    private String contractId;
    private String objId;
    private String contractName;
@@ -257,4 +260,27 @@
        this.contractFilePo = contractFilePo;
    }

    public String getPartyC() {
        return partyC;
    }

    public void setPartyC(String partyC) {
        this.partyC = partyC;
    }

    public String getcLink() {
        return cLink;
    }

    public void setcLink(String cLink) {
        this.cLink = cLink;
    }

    public String getcContacts() {
        return cContacts;
    }

    public void setcContacts(String cContacts) {
        this.cContacts = cContacts;
    }
}

 java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml

@@ -353,6 +353,90 @@
        </if>
    </select>


    <!-- 查询费用明细数量 add by wuxw 2018-07-03 -->
    <select id="queryFeeDetailsCountByVo" parameterType="Map" resultType="Map">
        select count(1) count
        from pay_fee_detail t
        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
        <if test="ownerId != null and ownerId != ''">
            left join pay_fee_attrs pfa on pfa.fee_id = t.fee_id and pfa.spec_cd = '390007' and pfa.status_cd = '0'
        </if>
        where 1 =1
        <if test="configId != null and configId != ''">
            and pf.config_id = #{configId}
        </if>
        <if test="payerObjId != null and payerObjId != ''">
            and pf.payer_obj_id = #{payerObjId}
        </if>
        <if test="payerObjType != null and payerObjType != ''">
            and pf.payer_obj_type = #{payerObjType}
        </if>
        <if test="ownerId != null and ownerId != ''">
            and pfa.value = #{ownerId}
        </if>
        <if test="primeRate !=null and primeRate != ''">
            and t.prime_rate= #{primeRate}
        </if>
        <if test="detailId !=null and detailId != ''">
            and t.detail_id= #{detailId}
        </if>
        <if test="detailIds !=null ">
            and t.detail_id in
            <foreach collection="detailIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="receivableAmount !=null and receivableAmount != ''">
            and t.receivable_amount= #{receivableAmount}
        </if>
        <if test="cycles !=null and cycles != ''">
            and t.cycles= #{cycles}
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="receivedAmount !=null and receivedAmount != ''">
            and t.received_amount= #{receivedAmount}
        </if>
        <if test="payableAmount !=null and payableAmount != ''">
            and t.payable_amount= #{payableAmount}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
        <if test="feeId !=null and feeId != ''">
            and t.fee_id= #{feeId}
        </if>
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="startTime !=null ">
            and t.start_time &gt;= #{startTime}
        </if>
        <if test="endTime !=null ">
            and t.end_time &lt;= #{endTime}
        </if>
        <if test="cashierId !=null and cashierId != ''">
            and t.cashier_id= #{cashierId}
        </if>
        <if test="cashierName !=null and cashierName != ''">
            and t.cashier_name= #{cashierName}
        </if>
        <if test="openInvoice !=null and openInvoice != ''">
            and t.open_invoice= #{openInvoice}
        </if>
        <if test="curYear != null and curYear != ''">
            and DATE_FORMAT(DATE_SUB(t.end_time,INTERVAL 1 DAY),'%Y') = #{curYear}
        </if>
    </select>

    <!-- 保存费用明细信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveFeeDetail" parameterType="Map">
        insert into

 java110-db/src/main/resources/mapper/store/ContractPartyaServiceDaoImplMapper.xml

@@ -5,14 +5,14 @@

    <!-- 保存合同房屋信息 add by wuxw 2018-07-03 -->
    <insert id="saveContractPartyaInfo" parameterType="Map">
        insert into contract_partya(party_a, a_link, a_contacts, partya_id, store_id)
        values (#{partyA}, #{aLink}, #{aContacts}, #{partyaId}, #{storeId})
        insert into contract_partya(party_a, a_link, a_contacts, partya_id, store_id,type_id)
        values (#{partyA}, #{aLink}, #{aContacts}, #{partyaId}, #{storeId},#{typeId})
    </insert>

    <!-- 查询合同房屋信息 add by wuxw 2018-07-03 -->
    <select id="getContractPartyaInfo" parameterType="Map" resultType="Map">
        select t.party_a,t.party_a partyA,t.a_link,t.a_link aLink,t.a_contacts,t.a_contacts
        aContacts,t.partya_id,t.partya_id partyaId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId
        aContacts,t.partya_id,t.partya_id partyaId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.type_id typeId
        from contract_partya t
        where 1 =1
        <if test="partyA !=null and partyA != ''">
@@ -32,6 +32,9 @@
        </if>
        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
        <if test="typeId !=null and typeId != ''">
            and t.type_id= #{typeId}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
@@ -56,6 +59,9 @@
        </if>
        <if test="storeId !=null and storeId != ''">
            , t.store_id= #{storeId}
        </if>
        <if test="typeId !=null and typeId != ''">
            , t.type_id= #{typeId}
        </if>
        where 1=1
        <if test="partyaId !=null and partyaId != ''">
@@ -86,5 +92,8 @@
        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
        <if test="typeId !=null and typeId != ''">
            and t.type_id= #{typeId}
        </if>
    </select>
</mapper>

 java110-interface/src/main/java/com/java110/intf/fee/IFeeDetailInnerServiceSMO.java

@@ -31,6 +31,7 @@
    @RequestMapping(value = "/queryFeeDetails", method = RequestMethod.POST)
    List<FeeDetailDto> queryFeeDetails(@RequestBody FeeDetailDto feeDetailDto);


    /**
     * <p>查询小区楼信息</p>
     *
@@ -49,6 +50,7 @@
    @RequestMapping(value = "/queryFeeDetailsCount", method = RequestMethod.POST)
    int queryFeeDetailsCount(@RequestBody FeeDetailDto feeDetailDto);

    int queryFeeDetailsCountByVo(@RequestBody PayFeeDetailPo payFeeDetailPo);
    /**
     * 保存费用明细
     *

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

@@ -193,8 +193,13 @@
                                                     @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 {

        if (cycles == 105){
            cycles = DateUtil.dayCompare(DateUtil.getDateFromStringB(custStartTime), DateUtil.getDateFromStringB(custEndTime));
        }
        if(!StringUtil.isEmpty(custEndTime)){
            double c = DateUtil.dayCompare(DateUtil.getDateFromStringB(endTime),DateUtil.getDateFromStringB(custEndTime));
            cycles = c;

 service-fee/src/main/java/com/java110/fee/dao/IFeeDetailServiceDao.java

@@ -71,6 +71,8 @@
     */
    int queryFeeDetailsCount(Map info);

    int queryFeeDetailsCountByVo(Map info);

    /**
     * 保存 费用明细信息
     *

 service-fee/src/main/java/com/java110/fee/dao/impl/FeeDetailServiceDaoImpl.java

@@ -128,6 +128,18 @@
    }

    @Override
    public int queryFeeDetailsCountByVo(Map info) {
        logger.debug("查询费用明细数据 入参 info : {}",info);

        List<Map> infos = sqlSessionTemplate.selectList("feeDetailServiceDaoImpl.queryFeeDetailsCountByVo", info);
        if (infos.size() < 1) {
            return 0;
        }

        return Integer.parseInt(infos.get(0).get("count").toString());
    }

    @Override
    public void saveFeeDetail(Map feeDetail) throws DAOException {
        logger.debug("保存明细 入参 info : {}",feeDetail);


 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDetailInnerServiceSMOImpl.java

@@ -13,6 +13,8 @@
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
@@ -51,6 +53,7 @@
        return feeDetails;
    }


    @Override
    public List<FeeDetailDto> queryBusinessFeeDetails(@RequestBody FeeDetailDto feeDetailDto) {

@@ -87,6 +90,11 @@
    }

    @Override
    public int queryFeeDetailsCountByVo(@RequestBody PayFeeDetailPo payFeeDetailPo){
        return feeDetailServiceDaoImpl.queryFeeDetailsCountByVo(BeanConvertUtil.beanCovertMap(payFeeDetailPo));
    }

    @Override
    @Java110Transactional
    public int saveFeeDetail(@RequestBody PayFeeDetailPo payFeeDetailPo) {
        feeDetailServiceDaoImpl.saveFeeDetail(BeanConvertUtil.beanCovertMap(payFeeDetailPo));

 service-fee/src/main/java/com/java110/fee/smo/impl/FeeDiscountInnerServiceSMOImpl.java

@@ -10,6 +10,7 @@
import com.java110.dto.fee.FeeDiscountRuleDto;
import com.java110.dto.fee.FeeDiscountSpecDto;
import com.java110.dto.payFee.PayFeeConfigDiscountDto;
import com.java110.dto.work.WorkCopyDto;
import com.java110.fee.dao.IFeeDiscountServiceDao;
import com.java110.fee.discount.IComputeDiscount;
import com.java110.intf.fee.*;
@@ -268,22 +269,25 @@
            //房屋id
            applyRoomDiscountDto.setRoomId(feeDetailDto.getPayerObjId());
            //开始时间
            applyRoomDiscountDto.setStartTime(simpleDateFormat.format(feeDetailDto.getStartTime()));
//            applyRoomDiscountDto.setStartTime(simpleDateFormat.format(feeDetailDto.getStartTime()));
            //结束时间
            c.setTime(feeDetailDto.getStartTime());
            c.add(Calendar.DAY_OF_MONTH, 2);//开始时间，添加1，2天的冗余，只要比5小即可
            applyRoomDiscountDto.setStartTime(simpleDateFormat.format(c.getTime()));//重新设置开始时间
//            c.add(Calendar.DAY_OF_MONTH, 2);//开始时间，添加1，2天的冗余，只要比5小即可
//            applyRoomDiscountDto.setStartTime(simpleDateFormat.format(c.getTime()));//重新设置开始时间
            double month = Double.parseDouble(feeDetailDto.getCycles());
            if(month == 105){
                month = 2;
            }
//            if(month == 105){
//                return;
//            }
            c.add(Calendar.MONTH, (int) month);
            c.add(Calendar.DAY_OF_MONTH, -5);//这里根据设置时间荣誉5天
//            c.add(Calendar.DAY_OF_MONTH, -5);//这里根据设置时间荣誉5天
            Date endTime = c.getTime();
            applyRoomDiscountDto.setEndTime(simpleDateFormat.format(endTime));
//            applyRoomDiscountDto.setEndTime(simpleDateFormat.format(endTime));
            applyRoomDiscountDto.setFeeId(feeDetailDto.getFeeId());
            //查询折扣申请表
            List<ApplyRoomDiscountDto> applyRoomDiscountDtos = applyRoomDiscountInnerServiceSMOImpl.queryApplyRoomDiscounts(applyRoomDiscountDto);



            //判断查询的折扣申请表是否有数据
            if (applyRoomDiscountDtos != null && applyRoomDiscountDtos.size() > 0) {
                //获取优惠id
@@ -293,11 +297,51 @@
                PayFeeConfigDiscountDto payFeeConfigDiscount = new PayFeeConfigDiscountDto();
                payFeeConfigDiscount.setCommunityId(applyRoomDiscountDtos.get(0).getCommunityId());
                payFeeConfigDiscount.setDiscountId(discountId);
                doCompute(payFeeConfigDiscount, Double.parseDouble(feeDetailDto.getCycles()), computeDiscountDtos, feeDetailDto.getFeeId());
                if(applyRoomDiscountDtos.get(0).getStartTime() == null){
                    payFeeConfigDiscount.setStartTime(feeDetailDto.getStartTime());
                }else if(DateUtil.getDateFromStringB(applyRoomDiscountDtos.get(0).getStartTime()).before(feeDetailDto.getStartTime())){
                    payFeeConfigDiscount.setStartTime(feeDetailDto.getStartTime());
                }else{
                    payFeeConfigDiscount.setStartTime(DateUtil.getDateFromStringB(applyRoomDiscountDtos.get(0).getStartTime()));
                }
                if(applyRoomDiscountDtos.get(0).getEndTime() == null){
                    payFeeConfigDiscount.setEndTime(endTime);
                }else if(DateUtil.getDateFromStringB(applyRoomDiscountDtos.get(0).getEndTime()).after(endTime)){
                    payFeeConfigDiscount.setEndTime(endTime);
                }else{
                    payFeeConfigDiscount.setEndTime(DateUtil.getDateFromStringB(applyRoomDiscountDtos.get(0).getEndTime()));
                }
                double cycle =
                        DateUtil.dayCompare(
                                payFeeConfigDiscount.getStartTime(),
                                payFeeConfigDiscount.getEndTime()
                        );
                doComputeB(payFeeConfigDiscount, cycle, computeDiscountDtos, feeDetailDto.getFeeId());
            }
        }
    }

    private void doComputeB(PayFeeConfigDiscountDto tmpPayFeeConfigDiscountDto, double cycles, List<ComputeDiscountDto> computeDiscountDtos, String feeId) {
        FeeDiscountDto feeDiscountDto = new FeeDiscountDto();
        feeDiscountDto.setCommunityId(tmpPayFeeConfigDiscountDto.getCommunityId());
        feeDiscountDto.setDiscountId(tmpPayFeeConfigDiscountDto.getDiscountId());
        List<FeeDiscountDto> feeDiscountDtos = queryFeeDiscounts(feeDiscountDto);
        if (feeDiscountDtos == null || feeDiscountDtos.size() < 1) {
            return;
        }

        for (FeeDiscountDto tmpFeeDiscountDto : feeDiscountDtos) {
            tmpFeeDiscountDto.setFeeId(feeId);
            tmpFeeDiscountDto.setCycles(cycles);
        }
        IComputeDiscount computeDiscount = (IComputeDiscount) ApplicationContextFactory.getBean(feeDiscountDtos.get(0).getBeanImpl());
        ComputeDiscountDto computeDiscountDto = computeDiscount.compute(feeDiscountDtos.get(0));
        if (computeDiscountDto == null) {
            return;
        }
        computeDiscountDtos.add(computeDiscountDto);
    }

    private void doCompute(PayFeeConfigDiscountDto tmpPayFeeConfigDiscountDto, double cycles, List<ComputeDiscountDto> computeDiscountDtos, String feeId) {
        FeeDiscountDto feeDiscountDto = new FeeDiscountDto();
        feeDiscountDto.setCommunityId(tmpPayFeeConfigDiscountDto.getCommunityId());

 service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java

@@ -247,12 +247,19 @@
        payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
        payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
        payFeeDetailPo.setEndTime(importRoomFee.getEndTime());
        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        payFeeDetailPo.setRemark(importRoomFee.getRemark());
        payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
        payFeeDetailPo.setState("1400");
        payFeeDetailPo.setCashierName(importRoomFee.getStaffName());
        payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());

        int count = feeDetailInnerServiceSMOImpl.queryFeeDetailsCountByVo(payFeeDetailPo);

        if (count > 0) {
            throw new IllegalStateException("重复的缴费记录");
        }

        payFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
        if(importRoomFee.getOpenInv() != null){
            payFeeDetailPo.setOpenInvoice(importRoomFee.getOpenInv());
        }
@@ -265,12 +272,6 @@
        fee.setFeeId(tmpFeeDto.getFeeId());
        FeeDto feeInfo = feeInnerServiceSMOImpl.queryFees(fee).get(0);

        if (feeInfo.getEndTime().after(feeInfo.getMaxEndTime()) || feeInfo.getEndTime().getTime() == feeInfo.getMaxEndTime().getTime()) {
            PayFeePo payFeePo = new PayFeePo();
            payFeePo.setFeeId(feeInfo.getFeeId());
            payFeePo.setState(FeeDto.STATE_FINISH);
            int i = feeInnerServiceSMOImpl.updateFee(payFeePo);
        }

//        int i = feeInnerServiceSMOImpl.updateFee(feeInfo);

@@ -284,12 +285,22 @@
        payFeePo.setCommunityId(importRoomFee.getCommunityId());
        payFeePo.setStatusCd(StatusConstant.STATUS_CD_VALID);
        payFeePo.setFeeId(tmpFeeDto.getFeeId());
        String[] arr = importRoomFee.getEndTime().split(" ");
        if (arr.length >= 2 &&arr[1].equals("23:59:59")){
            importRoomFee.setEndTime(arr[0] + " 00:00:00");
        }
        payFeePo.setEndTime(DateUtil.getNextSecTime(importRoomFee.getEndTime()));
        if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
            payFeePo.setState(FeeDto.STATE_FINISH);
        }

        feeInnerServiceSMOImpl.updateFee(payFeePo);
        feeInfo = feeInnerServiceSMOImpl.queryFees(fee).get(0);
        if (DateUtil.getFormatTimeStringB(feeInfo.getEndTime()).equals(DateUtil.getFormatTimeStringB(feeInfo.getMaxEndTime()))) {
            PayFeePo payFee = new PayFeePo();
            payFee.setFeeId(feeInfo.getFeeId());
            payFee.setState(FeeDto.STATE_FINISH);
            int i = feeInnerServiceSMOImpl.updateFee(payFee);
        }
    }



 service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java

@@ -40,13 +40,13 @@
                                                     @RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
//        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
//        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
        Assert.hasKeyAndValue(reqJson, "typeId", "请求报文中未包含typeId");


        ContractPartyaPo contractPartyaPo = BeanConvertUtil.covertBean(reqJson, ContractPartyaPo.class);
        contractPartyaPo.setStoreId(storeId);

        return saveContractPartyaBMOImpl.save(contractPartyaPo);
    }

@@ -63,8 +63,9 @@
                                                       @RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "partyA", "请求报文中未包含partyA");
        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
//        Assert.hasKeyAndValue(reqJson, "aContacts", "请求报文中未包含aContacts");
//        Assert.hasKeyAndValue(reqJson, "aLink", "请求报文中未包含aLink");
        Assert.hasKeyAndValue(reqJson, "typeId", "请求报文中未包含typeId");
        Assert.hasKeyAndValue(reqJson, "partyaId", "partyaId不能为空");


@@ -108,6 +109,7 @@
                                                      @RequestParam(value = "partyA", required = false) String partyA,
                                                      @RequestParam(value = "aContacts", required = false) String aContacts,
                                                      @RequestParam(value = "aLink", required = false) String aLink,
                                                      @RequestParam(value = "typeId", required = false) String typeId,
                                                      @RequestParam(value = "page") int page,
                                                      @RequestParam(value = "row") int row) {
        ContractPartyaDto contractPartyaDto = new ContractPartyaDto();
@@ -117,6 +119,7 @@
        contractPartyaDto.setPartyA(partyA);
        contractPartyaDto.setaContacts(aContacts);
        contractPartyaDto.setaLink(aLink);
        contractPartyaDto.setTypeId(typeId);
        return getContractPartyaBMOImpl.get(contractPartyaDto);
    }
}

 springboot/src/main/resources/application.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active:  debug
    active:  devlocal

#  docker build -t lx .
#