优化 离散月

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

@@ -12,7 +12,8 @@
         fee_name,config_id
         ) values (
         #{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId},
-        #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime}, #{feeName},#{configId}
+        #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime},
+        #{feeName},#{configId}
         )
     </insert>
 
@@ -39,7 +40,8 @@
         detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount
         discountAmount,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
         receivedAmount,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,t.month_id,t.month_id monthId,
-        t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time payFeeTime,
+        t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time
+        payFeeTime,
         t.cur_month_time curMonthTime
         from pay_fee_detail_month t
         where 1 =1
@@ -163,6 +165,22 @@
         </if>
     </update>
 
+    <!-- 删除离散数据 -->
+    <update id="deletePayFeeDetailMonthInfo" parameterType="Map">
+        delete from pay_fee_detail_month
+        where 1=1
+        and community_id= #{communityId}
+        <if test="monthId !=null and monthId != ''">
+            and month_id= #{monthId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and fee_id= #{feeId}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and detail_id= #{detailId}
+        </if>
+    </update>
+
     <!-- 查询月缴费表数量 add by wuxw 2018-07-03 -->
     <select id="queryPayFeeDetailMonthsCount" parameterType="Map" resultType="Map">
         select count(1) count
@@ -226,7 +244,8 @@
         detailId,t.receivable_amount,t.receivable_amount receivableAmount,t.discount_amount,t.discount_amount
         discountAmount,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount
         receivedAmount,t.community_id,t.community_id communityId,t.fee_id,t.fee_id feeId,t.month_id,t.month_id monthId,
-        t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time payFeeTime,
+        t.obj_name objName,t.obj_id objId,t.owner_name ownerName,t.owner_id ownerId,t.link,t.state,t.pay_fee_time
+        payFeeTime,
         t.cur_month_time curMonthTime
         from pay_fee_detail_month t
         where 1 =1
@@ -288,4 +307,34 @@
 
     </select>
 
+    <!-- 查询需要离散的缴费记录 -->
+    <select id="getWaitDispersedFeeDetail" parameterType="Map" resultType="Map">
+        select t.prime_rate,t.prime_rate primeRate,
+        t.detail_id,t.detail_id detailId,
+        t.receivable_amount,t.receivable_amount receivableAmount,
+        t.cycles,t.remark,t.status_cd,t.status_cd statusCd,t.received_amount,t.received_amount receivedAmount,
+        t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.fee_id,t.fee_id feeId ,t.create_time createTime,
+        t.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime,pfa.`value`
+        importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
+        mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
+        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value`
+        payerObjName,
+        t.cashier_id cashierId,t.cashier_name cashierName
+        from pay_fee_detail t
+        left join pay_fee_detail_month pfdm on t.fee_id = pfdm.fee_id and pfdm.detail_id = t.detail_id and
+        pfdm.status_cd = '0' and t.community_id = pfdm.community_id
+        left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
+        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+        left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
+        LEFT JOIN meter_water mw on t.fee_id = mw.fee_id and mw.status_cd = '0' and mw.community_id = t.community_id
+        left join pay_fee_attrs pfao1 on pfao1.fee_id = t.fee_id and pfao1.spec_cd = '390012' and pfao1.status_cd = '0'
+        left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
+        left join t_dict td on t.prime_rate = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns =
+        'prime_rate'
+        where t.status_cd = '0'
+        and t.state in ('1000','1400')
+        and t.community_id = #{communityId}
+        and t.fee_id = #{feeId}
+        and pfdm.detail_id is null
+    </select>
 </mapper>

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

@@ -1,6 +1,7 @@
 package com.java110.intf.fee;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.payFeeDetailMonth.PayFeeDetailMonthDto;
 import com.java110.po.payFeeDetailMonth.PayFeeDetailMonthPo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -57,4 +58,12 @@ public interface IPayFeeDetailMonthInnerServiceSMO {
 
     @RequestMapping(value = "/queryPayFeeDetailMaxMonths", method = RequestMethod.POST)
     List<PayFeeDetailMonthDto> queryPayFeeDetailMaxMonths(@RequestBody PayFeeDetailMonthDto payFeeDetailMonthDto);
+
+    /**
+     * 处理需要离散的缴费记录
+     * @param payFeeDetailMonthDto
+     * @return
+     */
+    @RequestMapping(value = "/getWaitDispersedFeeDetail", method = RequestMethod.POST)
+    List<FeeDetailDto> getWaitDispersedFeeDetail(@RequestBody PayFeeDetailMonthDto payFeeDetailMonthDto);
 }

java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -756,4 +756,16 @@ public class DateUtil {
         return list;
     }
 
+    /**
+     * 除去 小时 分 秒
+     * @param time
+     * @return
+     */
+    public static Date timeToDate(Date time){
+        Calendar calendar =Calendar.getInstance();
+        calendar.setTime(time);
+        setTimeToMidnight(calendar);
+        return calendar.getTime();
+    }
+
 }

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

@@ -62,4 +62,13 @@ public interface IPayFeeDetailMonthServiceDao {
 
 
     List<Map> queryPayFeeDetailMaxMonths(Map info);
+
+    /**
+     * 处理需要离散的 缴费记录
+     * @param info
+     * @return
+     */
+    List<Map> getWaitDispersedFeeDetail(Map info);
+
+    void deletePayFeeDetailMonthInfo(Map info);
 }

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

@@ -111,5 +111,19 @@ public class PayFeeDetailMonthServiceDaoImpl extends BaseServiceDao implements I
         return businessPayFeeDetailMonthInfos;
     }
 
+    @Override
+    public List<Map> getWaitDispersedFeeDetail(Map info) {
+        logger.debug("查询getWaitDispersedFeeDetail信息 入参 info : {}", info);
+
+        List<Map> businessPayFeeDetailMonthInfos = sqlSessionTemplate.selectList("payFeeDetailMonthServiceDaoImpl.getWaitDispersedFeeDetail", info);
+
+        return businessPayFeeDetailMonthInfos;
+    }
+
+    @Override
+    public void deletePayFeeDetailMonthInfo(Map info) {
+        sqlSessionTemplate.update("payFeeDetailMonthServiceDaoImpl.deletePayFeeDetailMonthInfo", info);
+    }
+
 
 }

service-fee/src/main/java/com/java110/fee/feeMonth/IPayFeeMonthHelp.java

@@ -45,4 +45,7 @@ public interface IPayFeeMonthHelp {
     String getFeeFeeTime(List<FeeDetailDto> feeDetailDtos, String detailId);
 
 
+    void waitDispersedFeeDetail(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto);
+
+    void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime);
 }

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthHelp.java

@@ -1,11 +1,15 @@
 package com.java110.fee.feeMonth;
 
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.core.smo.IComputeFeeSMO;
 import com.java110.dto.fee.FeeAttrDto;
 import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
+import com.java110.dto.payFeeDetailMonth.PayFeeDetailMonthDto;
 import com.java110.dto.payFeeDetailMonth.PayFeeMonthOwnerDto;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
+import com.java110.po.payFeeDetailMonth.PayFeeDetailMonthPo;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.utils.util.DateUtil;
 import org.springframework.beans.BeanUtils;
@@ -13,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 public class PayFeeMonthHelp implements IPayFeeMonthHelp {
@@ -27,6 +28,9 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
     @Autowired
     private IComputeFeeSMO computeFeeSMOImpl;
 
+    @Autowired
+    private IPayFeeDetailMonthInnerServiceSMO payFeeDetailMonthInnerServiceSMOImpl;
+
 
     public PayFeeMonthOwnerDto generatorOwnerRoom(FeeDto feeDto) {
 
@@ -143,6 +147,231 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
         return null;
     }
 
+    /**
+     *  处理已经交过费的记录处理
+     * @param feeDto
+     * @param payFeeMonthOwnerDto
+     */
+    @Autowired
+    public void waitDispersedFeeDetail(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto) {
+        PayFeeDetailMonthDto payFeeDetailMonthDto = new PayFeeDetailMonthDto();
+        payFeeDetailMonthDto.setCommunityId(feeDto.getCommunityId());
+        payFeeDetailMonthDto.setFeeId(feeDto.getFeeId());
+        List<FeeDetailDto> feeDetailDtos = payFeeDetailMonthInnerServiceSMOImpl.getWaitDispersedFeeDetail(payFeeDetailMonthDto);
+
+        if (feeDetailDtos == null || feeDetailDtos.size() < 1) {
+            return;
+        }
+
+        for (FeeDetailDto feeDetailDto : feeDetailDtos) {
+            // todo 逐条去离散
+            doDispersedFeeDetail(feeDetailDto, feeDto, payFeeMonthOwnerDto);
+        }
+    }
+
+
+    /**
+     * 处理 欠费 离散
+     * @param feeDto
+     * @param payFeeMonthOwnerDto
+     * @param feePrice
+     * @param deadlineTime
+     */
+    @Autowired
+    public void waitDispersedOweFee(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date deadlineTime) {
+        // todo 费用已经结束
+        if(FeeDto.STATE_FINISH.equals(feeDto.getState())){
+            return ;
+        }
+
+        // todo 清理 detailId 为-1 的数据
+        PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
+        payFeeDetailMonthPo.setCommunityId(feeDto.getCommunityId());
+        payFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
+        payFeeDetailMonthPo.setDetailId("-1");
+        payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
+
+        List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
+        // todo 处理 开始时间和结束时间
+        Date startTime = DateUtil.timeToDate(feeDto.getEndTime());
+        Date endTime = DateUtil.timeToDate(deadlineTime);
+
+        BigDecimal receivableAmount = new BigDecimal(feePrice);
+
+        // todo 寻找第一个自然月 一日
+        Calendar firstMonthDayCal = Calendar.getInstance();
+        firstMonthDayCal.setTime(startTime);
+        firstMonthDayCal.add(Calendar.MONTH, 1);
+        firstMonthDayCal.set(Calendar.DAY_OF_MONTH, 1);
+        Date firstMonthDayTime = firstMonthDayCal.getTime();
+
+        Date startMonthDayTime = startTime;
+        // todo  循环，只到 firstMonthDayTime 大于 endTime
+        int curDay = 0;
+        int curMonthMaxDay = 30;
+        BigDecimal curMonthReceivableAmount = null;
+        BigDecimal dayReceivableAmount = null;
+        while (firstMonthDayTime.getTime() > endTime.getTime()) {
+            curDay = DateUtil.daysBetween(firstMonthDayTime, startMonthDayTime);
+
+            // todo 计算当月天数
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startMonthDayTime);
+            curMonthMaxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+            dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 4, BigDecimal.ROUND_HALF_UP);// 日 实收
+            // todo 计算 应收
+            curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+
+            // todo 保存数据到pay_fee_detail_month
+            toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+
+            // todo 将startTime 修改为 下月1日时间
+            startMonthDayTime = firstMonthDayTime;
+            firstMonthDayCal.add(Calendar.MONTH, 1);
+            firstMonthDayTime = firstMonthDayCal.getTime();
+        }
+
+        //todo 最后处理 最后 startMonthDayTime 到endTime 的
+        if (startMonthDayTime.getTime() >= endTime.getTime()) {
+            payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
+            return;
+        }
+
+        curDay = DateUtil.daysBetween(endTime, startMonthDayTime);
+
+        // todo 计算当月天数
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(startMonthDayTime);
+        curMonthMaxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        dayReceivableAmount = receivableAmount.divide(new BigDecimal(curMonthMaxDay), 4, BigDecimal.ROUND_HALF_UP);// 日 实收
+        // todo 计算 应收
+        curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+
+        // todo 保存数据到pay_fee_detail_month
+        toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), 0, null, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+        payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
+
+    }
+
+    private void doDispersedFeeDetail(FeeDetailDto feeDetailDto, FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto) {
+        List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
+
+        // todo 去除 开始时间和 结束时间的 小时 分钟 秒
+        Date startTime = DateUtil.timeToDate(feeDetailDto.getStartTime());
+        Date endTime = DateUtil.timeToDate(feeDetailDto.getEndTime());
+
+        int day = DateUtil.daysBetween(endTime, startTime);
+        if (day < 1) {
+            day = 1;
+        }
+
+        BigDecimal receivableAmount = new BigDecimal(Double.parseDouble(feeDetailDto.getReceivableAmount()));
+        BigDecimal receivedAmount = new BigDecimal(Double.parseDouble(feeDetailDto.getReceivedAmount()));
+
+        BigDecimal dayReceivableAmount = receivableAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 日 应收
+        BigDecimal dayReceivedAmount = receivedAmount.divide(new BigDecimal(day), 4, BigDecimal.ROUND_HALF_UP);// 日 实收
+
+        // todo 寻找第一个自然月 一日
+        Calendar firstMonthDayCal = Calendar.getInstance();
+        firstMonthDayCal.setTime(startTime);
+        firstMonthDayCal.add(Calendar.MONTH, 1);
+        firstMonthDayCal.set(Calendar.DAY_OF_MONTH, 1);
+        Date firstMonthDayTime = firstMonthDayCal.getTime();
+
+        Date startMonthDayTime = startTime;
+        // todo  循环，只到 firstMonthDayTime 大于 endTime
+        int curDay = 0;
+        BigDecimal curMonthReceivableAmount = null;
+        BigDecimal curMonthReceivedAmount = null;
+        while (firstMonthDayTime.getTime() > endTime.getTime()) {
+            curDay = DateUtil.daysBetween(firstMonthDayTime, startMonthDayTime);
+            // todo 计算 应收
+            curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+            // todo 计算 实收
+            curMonthReceivedAmount = new BigDecimal(curDay).multiply(dayReceivedAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+
+            // todo 保存数据到pay_fee_detail_month
+            toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), curMonthReceivedAmount.doubleValue(), feeDetailDto, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+
+            // todo 将startTime 修改为 下月1日时间
+            startMonthDayTime = firstMonthDayTime;
+            firstMonthDayCal.add(Calendar.MONTH, 1);
+            firstMonthDayTime = firstMonthDayCal.getTime();
+        }
+
+        //todo 最后处理 最后 startMonthDayTime 到endTime 的
+        if (startMonthDayTime.getTime() >= endTime.getTime()) {
+            payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
+            return;
+        }
+
+        curDay = DateUtil.daysBetween(endTime, startMonthDayTime);
+        // todo 计算 应收
+        curMonthReceivableAmount = new BigDecimal(curDay).multiply(dayReceivableAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+        // todo 计算 实收
+        curMonthReceivedAmount = new BigDecimal(curDay).multiply(dayReceivedAmount).setScale(4, BigDecimal.ROUND_HALF_UP);
+
+        // todo 保存数据到pay_fee_detail_month
+        toSavePayFeeDetailMonth(curMonthReceivableAmount.doubleValue(), curMonthReceivedAmount.doubleValue(), feeDetailDto, feeDto, payFeeMonthOwnerDto,payFeeDetailMonthPos,startMonthDayTime);
+        payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
+
+    }
+
+    /**
+     * 保存数据
+     *
+     * @param receivableAmount
+     * @param receivedAmount
+     * @param feeDetailDto
+     * @param feeDto
+     */
+    private void toSavePayFeeDetailMonth(double receivableAmount,
+                                         double receivedAmount,
+                                         FeeDetailDto feeDetailDto,
+                                         FeeDto feeDto,
+                                         PayFeeMonthOwnerDto payFeeMonthOwnerDto,
+                                         List<PayFeeDetailMonthPo> payFeeDetailMonthPos,
+                                         Date curTime) {
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(curTime);
+        PayFeeDetailMonthPo tmpPayFeeDetailMonthPo = new PayFeeDetailMonthPo();
+        tmpPayFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
+        tmpPayFeeDetailMonthPo.setCommunityId(feeDto.getCommunityId());
+        if(feeDetailDto == null){
+            tmpPayFeeDetailMonthPo.setDetailId("-1");
+        }else{ // todo 交费记录 保存时
+            tmpPayFeeDetailMonthPo.setDetailId(feeDetailDto.getDetailId());
+        }
+        tmpPayFeeDetailMonthPo.setDetailYear(calendar.get(Calendar.YEAR) + "");
+        tmpPayFeeDetailMonthPo.setDetailMonth((calendar.get(Calendar.MONTH) + 1) + "");
+
+        tmpPayFeeDetailMonthPo.setReceivableAmount(receivableAmount + "");
+        tmpPayFeeDetailMonthPo.setReceivedAmount(receivedAmount + "");
+        tmpPayFeeDetailMonthPo.setDiscountAmount(
+                getDiscountAmount(Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivableAmount()),
+                        Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivedAmount()),
+                        calendar.getTime(), feeDto) + "");
+        tmpPayFeeDetailMonthPo.setMonthId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_monthId));
+        tmpPayFeeDetailMonthPo.setRemark("程序计算生成");
+        tmpPayFeeDetailMonthPo.setObjName(payFeeMonthOwnerDto.getObjName());
+        tmpPayFeeDetailMonthPo.setObjId(payFeeMonthOwnerDto.getObjId());
+        tmpPayFeeDetailMonthPo.setOwnerId(payFeeMonthOwnerDto.getOwnerId());
+        tmpPayFeeDetailMonthPo.setOwnerName(payFeeMonthOwnerDto.getOwnerName());
+        tmpPayFeeDetailMonthPo.setLink(payFeeMonthOwnerDto.getLink());
+        tmpPayFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
+        if(feeDetailDto == null){
+            tmpPayFeeDetailMonthPo.setPayFeeTime(null);
+        }else{ // todo 交费记录 保存时
+            tmpPayFeeDetailMonthPo.setPayFeeTime(DateUtil.getFormatTimeStringA(feeDetailDto.getCreateTime()));
+        }
+        tmpPayFeeDetailMonthPo.setState("W"); // todo 这里暂时写死，目前用不到，算是预留字段
+        tmpPayFeeDetailMonthPo.setFeeName(feeDto.getFeeName());
+        tmpPayFeeDetailMonthPo.setConfigId(feeDto.getConfigId());
+        payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);
+
+    }
+
     /**
      * 获取当前缴费记录
      *

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImpl.java

@@ -17,10 +17,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
  * 费用离散为月 实现类
+ * V2
+ * <p>
+ * case 1 定时任务 调用
  */
 @Service
 public class PayFeeMonthImpl implements IPayFeeMonth {
@@ -46,128 +50,8 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
 
     public static final int DEFAULT_DEAL_COUNT = 200;
 
-
     /**
-     * 生成单个费用 并 离散到月
-     *
-     * @param feeId
-     * @param communityId
-     */
-    @Override
-    public void doGeneratorOrRefreshFeeMonth(String feeId, String communityId) {
-
-        // todo 查询费用
-        FeeDto feeDto = new FeeDto();
-        feeDto.setCommunityId(communityId);
-        feeDto.setFeeId(feeId);
-        List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
-        Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
-
-        doGeneratorOrRefreshFeeMonth(tmpFeeDtos.get(0), communityId);
-    }
-
-    public void doGeneratorOrRefreshFeeMonth(FeeDto feeDto, String communityId) {
-
-
-        //todo 计算每月单价
-        Double feePrice = payFeeMonthHelp.getMonthFeePrice(feeDto);
-
-        // todo 准备离散的基础数据
-        PayFeeMonthOwnerDto payFeeMonthOwnerDto = payFeeMonthHelp.generatorOwnerRoom(feeDto);
-
-        //todo 离散start_time 或者 pay_fee_detail_month 最大月份 到  deadlineTime 的数据
-        maxMonthDateToDeadlineTimeData(feeDto, payFeeMonthOwnerDto, feePrice);
-
-
-    }
-
-    /**
-     * 离散最大 离散月到 deadlineTime 的数据
-     *
-     * @param feeDto
-     * @param payFeeMonthOwnerDto
-     * @param feePrice
-     */
-    private void maxMonthDateToDeadlineTimeData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice) {
-        PayFeeDetailMonthDto payFeeDetailMonthDto = new PayFeeDetailMonthDto();
-        payFeeDetailMonthDto.setCommunityId(feeDto.getCommunityId());
-        payFeeDetailMonthDto.setFeeId(feeDto.getFeeId());
-        List<PayFeeDetailMonthDto> payFeeDetailMonthDtos = payFeeDetailMonthInnerServiceSMOImpl.queryPayFeeDetailMaxMonths(payFeeDetailMonthDto);
-        Date startTime = null;
-        Date deadlineTime = computeFeeSMOImpl.getDeadlineTime(feeDto);
-        if (payFeeDetailMonthDtos == null || payFeeDetailMonthDtos.size() < 1) {
-            startTime = feeDto.getStartTime();
-        } else {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(DateUtil.getDateFromStringA(payFeeDetailMonthDtos.get(0).getCurMonthTime()));
-            calendar.add(Calendar.MONTH, 1);
-            startTime = calendar.getTime();
-        }
-
-        // todo 生成一段时间内的数据
-        doGeneratorTimeMonthData(feeDto, payFeeMonthOwnerDto, feePrice, startTime, deadlineTime);
-
-    }
-
-    private void doGeneratorTimeMonthData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date startTime, Date endTime) {
-        double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(startTime, endTime));
-
-        if (maxMonth < 1) {
-            return;
-        }
-        //todo 查询 缴费明细
-        FeeDetailDto feeDetailDto = new FeeDetailDto();
-        feeDetailDto.setCommunityId(feeDto.getCommunityId());
-        feeDetailDto.setFeeId(feeDto.getFeeId());
-        feeDetailDto.setStates(new String[]{FeeDetailDto.STATE_NORMAL,FeeDetailDto.STATE_RETURNING});
-        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
-
-        //todo 生成 月离散数据
-        PayFeeDetailMonthPo tmpPayFeeDetailMonthPo;
-        List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
-        double receivableAmount = 0.0;
-        for (int month = 0; month < maxMonth; month++) {
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(startTime);
-            calendar.add(Calendar.MONTH, month);
-            //calendar.set(Calendar.DAY_OF_MONTH, 1);
-            tmpPayFeeDetailMonthPo = new PayFeeDetailMonthPo();
-            tmpPayFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
-            tmpPayFeeDetailMonthPo.setCommunityId(feeDto.getCommunityId());
-            tmpPayFeeDetailMonthPo.setDetailId(payFeeMonthHelp.getFeeDetailId(feeDetailDtos, calendar.getTime()));
-            tmpPayFeeDetailMonthPo.setDetailYear(calendar.get(Calendar.YEAR) + "");
-            tmpPayFeeDetailMonthPo.setDetailMonth((calendar.get(Calendar.MONTH) + 1) + "");
-            receivableAmount = payFeeMonthHelp.getReceivableAmount(feeDetailDtos, feePrice, calendar.getTime(), feeDto);
-            //todo 应收小于等于0 不统计
-            if(receivableAmount <=0){
-                continue;
-            }
-            tmpPayFeeDetailMonthPo.setReceivableAmount( receivableAmount + "");
-            tmpPayFeeDetailMonthPo.setReceivedAmount(payFeeMonthHelp.getReceivedAmount(feeDetailDtos, feePrice, calendar.getTime(), feeDto) + "");
-            tmpPayFeeDetailMonthPo.setDiscountAmount(
-                    payFeeMonthHelp.getDiscountAmount(Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivableAmount()),
-                            Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivedAmount()),
-                            calendar.getTime(), feeDto) + "");
-            tmpPayFeeDetailMonthPo.setMonthId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_monthId));
-            tmpPayFeeDetailMonthPo.setRemark("程序计算生成");
-            tmpPayFeeDetailMonthPo.setObjName(payFeeMonthOwnerDto.getObjName());
-            tmpPayFeeDetailMonthPo.setObjId(payFeeMonthOwnerDto.getObjId());
-            tmpPayFeeDetailMonthPo.setOwnerId(payFeeMonthOwnerDto.getOwnerId());
-            tmpPayFeeDetailMonthPo.setOwnerName(payFeeMonthOwnerDto.getOwnerName());
-            tmpPayFeeDetailMonthPo.setLink(payFeeMonthOwnerDto.getLink());
-            tmpPayFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
-            tmpPayFeeDetailMonthPo.setPayFeeTime(payFeeMonthHelp.getFeeFeeTime(feeDetailDtos, tmpPayFeeDetailMonthPo.getDetailId()));
-            tmpPayFeeDetailMonthPo.setState("W"); // todo 这里暂时写死，目前用不到，算是预留字段
-            tmpPayFeeDetailMonthPo.setFeeName(feeDto.getFeeName());
-            tmpPayFeeDetailMonthPo.setConfigId(feeDto.getConfigId());
-            payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);
-        }
-        payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
-    }
-
-    /**
-     * 小区数据 离散为 月数据
+     * 1.0 定时任务离散 小区数据 离散为 月数据
      *
      * @param communityId
      */
@@ -203,7 +87,7 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
     }
 
     /**
-     * 物业缴费时离散 报表数据
+     * 2.0 物业缴费时离散 报表数据
      *
      * @param feeId
      * @param detailId
@@ -239,9 +123,38 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
         doDeletePayFeeDetailInMonth(feeDto, feeDetailDtos.get(0));
 
         // todo 生成一段时间内的数据
-        doGeneratorTimeMonthData(feeDto, payFeeMonthOwnerDto, feePrice, feeDetailDtos.get(0).getStartTime(), feeDetailDtos.get(0).getEndTime());
+        maxMonthDateToDeadlineTimeData(feeDto, payFeeMonthOwnerDto, feePrice);
+    }
+
+    /**
+     * 生成单个费用 并 离散到月
+     *
+     * @param feeId
+     * @param communityId
+     */
+    @Override
+    public void doGeneratorOrRefreshFeeMonth(String feeId, String communityId) {
+
+        // todo 查询费用
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(communityId);
+        feeDto.setFeeId(feeId);
+        List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
+
+        doGeneratorOrRefreshFeeMonth(tmpFeeDtos.get(0), communityId);
     }
 
+
+
+
+    /**
+     * 删除月费用
+     *
+     * @param feeId
+     * @param communityId
+     */
     @Override
     public void deleteFeeMonth(String feeId, String communityId) {
 
@@ -251,6 +164,42 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
         payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
     }
 
+    private void doGeneratorOrRefreshFeeMonth(FeeDto feeDto, String communityId) {
+
+        //todo 计算每月单价
+        Double feePrice = payFeeMonthHelp.getMonthFeePrice(feeDto);
+
+        // todo 准备离散的基础数据
+        PayFeeMonthOwnerDto payFeeMonthOwnerDto = payFeeMonthHelp.generatorOwnerRoom(feeDto);
+
+        //todo 离散start_time 或者 pay_fee_detail_month 最大月份 到  deadlineTime 的数据
+        maxMonthDateToDeadlineTimeData(feeDto, payFeeMonthOwnerDto, feePrice);
+
+
+    }
+
+    /**
+     * 离散最大 离散月到 deadlineTime 的数据
+     * <p>
+     * 核心方法处理
+     *
+     * @param feeDto
+     * @param payFeeMonthOwnerDto
+     * @param feePrice
+     */
+    private void maxMonthDateToDeadlineTimeData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice) {
+
+        //todo 处理已经交过费的记录处理
+        payFeeMonthHelp.waitDispersedFeeDetail(feeDto, payFeeMonthOwnerDto);
+
+
+        //todo 处理 endTime 到 deadlineTime 的费用
+        Date deadlineTime = computeFeeSMOImpl.getDeadlineTime(feeDto);
+        payFeeMonthHelp.waitDispersedOweFee(feeDto,payFeeMonthOwnerDto,feePrice,deadlineTime);
+
+    }
+
+
     /**
      * 删除缴费范围内的数据
      *

service-fee/src/main/java/com/java110/fee/feeMonth/PayFeeMonthImplV1.txt

@@ -0,0 +1,288 @@
+package com.java110.fee.feeMonth;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.log.LoggerFactory;
+import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.fee.FeeDetailDto;
+import com.java110.dto.fee.FeeDto;
+import com.java110.dto.payFeeDetailMonth.PayFeeDetailMonthDto;
+import com.java110.dto.payFeeDetailMonth.PayFeeMonthOwnerDto;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
+import com.java110.po.payFeeDetailMonth.PayFeeDetailMonthPo;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
+import org.slf4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 费用离散为月 实现类
+ */
+//@Service
+public class PayFeeMonthImplV1 implements IPayFeeMonth {
+    private static Logger logger = LoggerFactory.getLogger(PayFeeMonthImplV1.class);
+
+    @Autowired
+    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeConfigV1InnerServiceSMO payFeeConfigV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeDetailMonthInnerServiceSMO payFeeDetailMonthInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeMonthHelp payFeeMonthHelp;
+
+    @Autowired
+    private IComputeFeeSMO computeFeeSMOImpl;
+
+    public static final int DEFAULT_DEAL_COUNT = 200;
+
+
+    /**
+     * 生成单个费用 并 离散到月
+     *
+     * @param feeId
+     * @param communityId
+     */
+    @Override
+    public void doGeneratorOrRefreshFeeMonth(String feeId, String communityId) {
+
+        // todo 查询费用
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(communityId);
+        feeDto.setFeeId(feeId);
+        List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
+
+        doGeneratorOrRefreshFeeMonth(tmpFeeDtos.get(0), communityId);
+    }
+
+    public void doGeneratorOrRefreshFeeMonth(FeeDto feeDto, String communityId) {
+
+
+        //todo 计算每月单价
+        Double feePrice = payFeeMonthHelp.getMonthFeePrice(feeDto);
+
+        // todo 准备离散的基础数据
+        PayFeeMonthOwnerDto payFeeMonthOwnerDto = payFeeMonthHelp.generatorOwnerRoom(feeDto);
+
+        //todo 离散start_time 或者 pay_fee_detail_month 最大月份 到  deadlineTime 的数据
+        maxMonthDateToDeadlineTimeData(feeDto, payFeeMonthOwnerDto, feePrice);
+
+
+    }
+
+    /**
+     * 离散最大 离散月到 deadlineTime 的数据
+     *
+     * @param feeDto
+     * @param payFeeMonthOwnerDto
+     * @param feePrice
+     */
+    private void maxMonthDateToDeadlineTimeData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice) {
+        PayFeeDetailMonthDto payFeeDetailMonthDto = new PayFeeDetailMonthDto();
+        payFeeDetailMonthDto.setCommunityId(feeDto.getCommunityId());
+        payFeeDetailMonthDto.setFeeId(feeDto.getFeeId());
+        List<PayFeeDetailMonthDto> payFeeDetailMonthDtos = payFeeDetailMonthInnerServiceSMOImpl.queryPayFeeDetailMaxMonths(payFeeDetailMonthDto);
+        Date startTime = null;
+        Date deadlineTime = computeFeeSMOImpl.getDeadlineTime(feeDto);
+        if (payFeeDetailMonthDtos == null || payFeeDetailMonthDtos.size() < 1) {
+            startTime = feeDto.getStartTime();
+        } else {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(DateUtil.getDateFromStringA(payFeeDetailMonthDtos.get(0).getCurMonthTime()));
+            calendar.add(Calendar.MONTH, 1);
+            startTime = calendar.getTime();
+        }
+
+        // todo 生成一段时间内的数据
+        doGeneratorTimeMonthData(feeDto, payFeeMonthOwnerDto, feePrice, startTime, deadlineTime);
+
+    }
+
+    private void doGeneratorTimeMonthData(FeeDto feeDto, PayFeeMonthOwnerDto payFeeMonthOwnerDto, Double feePrice, Date startTime, Date endTime) {
+        double maxMonth = Math.ceil(computeFeeSMOImpl.dayCompare(startTime, endTime));
+
+        if (maxMonth < 1) {
+            return;
+        }
+        //todo 查询 缴费明细
+        FeeDetailDto feeDetailDto = new FeeDetailDto();
+        feeDetailDto.setCommunityId(feeDto.getCommunityId());
+        feeDetailDto.setFeeId(feeDto.getFeeId());
+        feeDetailDto.setStates(new String[]{FeeDetailDto.STATE_NORMAL,FeeDetailDto.STATE_RETURNING});
+        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+
+        //todo 生成 月离散数据
+        PayFeeDetailMonthPo tmpPayFeeDetailMonthPo;
+        List<PayFeeDetailMonthPo> payFeeDetailMonthPos = new ArrayList<>();
+        double receivableAmount = 0.0;
+        for (int month = 0; month < maxMonth; month++) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(startTime);
+            calendar.add(Calendar.MONTH, month);
+            //calendar.set(Calendar.DAY_OF_MONTH, 1);
+            tmpPayFeeDetailMonthPo = new PayFeeDetailMonthPo();
+            tmpPayFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
+            tmpPayFeeDetailMonthPo.setCommunityId(feeDto.getCommunityId());
+            tmpPayFeeDetailMonthPo.setDetailId(payFeeMonthHelp.getFeeDetailId(feeDetailDtos, calendar.getTime()));
+            tmpPayFeeDetailMonthPo.setDetailYear(calendar.get(Calendar.YEAR) + "");
+            tmpPayFeeDetailMonthPo.setDetailMonth((calendar.get(Calendar.MONTH) + 1) + "");
+            receivableAmount = payFeeMonthHelp.getReceivableAmount(feeDetailDtos, feePrice, calendar.getTime(), feeDto);
+            //todo 应收小于等于0 不统计
+            if(receivableAmount <=0){
+                continue;
+            }
+            tmpPayFeeDetailMonthPo.setReceivableAmount( receivableAmount + "");
+            tmpPayFeeDetailMonthPo.setReceivedAmount(payFeeMonthHelp.getReceivedAmount(feeDetailDtos, feePrice, calendar.getTime(), feeDto) + "");
+            tmpPayFeeDetailMonthPo.setDiscountAmount(
+                    payFeeMonthHelp.getDiscountAmount(Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivableAmount()),
+                            Double.parseDouble(tmpPayFeeDetailMonthPo.getReceivedAmount()),
+                            calendar.getTime(), feeDto) + "");
+            tmpPayFeeDetailMonthPo.setMonthId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_monthId));
+            tmpPayFeeDetailMonthPo.setRemark("程序计算生成");
+            tmpPayFeeDetailMonthPo.setObjName(payFeeMonthOwnerDto.getObjName());
+            tmpPayFeeDetailMonthPo.setObjId(payFeeMonthOwnerDto.getObjId());
+            tmpPayFeeDetailMonthPo.setOwnerId(payFeeMonthOwnerDto.getOwnerId());
+            tmpPayFeeDetailMonthPo.setOwnerName(payFeeMonthOwnerDto.getOwnerName());
+            tmpPayFeeDetailMonthPo.setLink(payFeeMonthOwnerDto.getLink());
+            tmpPayFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
+            tmpPayFeeDetailMonthPo.setPayFeeTime(payFeeMonthHelp.getFeeFeeTime(feeDetailDtos, tmpPayFeeDetailMonthPo.getDetailId()));
+            tmpPayFeeDetailMonthPo.setState("W"); // todo 这里暂时写死，目前用不到，算是预留字段
+            tmpPayFeeDetailMonthPo.setFeeName(feeDto.getFeeName());
+            tmpPayFeeDetailMonthPo.setConfigId(feeDto.getConfigId());
+            payFeeDetailMonthPos.add(tmpPayFeeDetailMonthPo);
+        }
+        payFeeDetailMonthInnerServiceSMOImpl.savePayFeeDetailMonths(payFeeDetailMonthPos);
+    }
+
+    /**
+     * 小区数据 离散为 月数据
+     *
+     * @param communityId
+     */
+    @Async
+    @Override
+    public void doGeneratorOrRefreshAllFeeMonth(String communityId) {
+
+
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(communityId);
+        int count = feeInnerServiceSMOImpl.queryFeesCount(feeDto);
+
+        int page = 1;
+        int max = 15;
+        if (count < DEFAULT_DEAL_COUNT) {
+            page = 1;
+            max = count;
+        } else {
+            page = (int) Math.ceil((double) count / (double) DEFAULT_DEAL_COUNT);
+            max = DEFAULT_DEAL_COUNT;
+        }
+
+        //todo  每次按200条处理
+        for (int pageIndex = 0; pageIndex < page; pageIndex++) {
+            feeDto.setPage(pageIndex + 1);
+            feeDto.setRow(max);
+            List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+            // 离散费用
+            doTmpFeeDtoMonths(communityId, tmpFeeDtos);
+        }
+
+
+    }
+
+    /**
+     * 物业缴费时离散 报表数据
+     *
+     * @param feeId
+     * @param detailId
+     * @param communityId
+     */
+    @Async
+    @Override
+    public void payFeeDetailRefreshFeeMonth(String feeId, String detailId, String communityId) {
+        // todo 查询费用
+        FeeDto feeDto = new FeeDto();
+        feeDto.setCommunityId(communityId);
+        feeDto.setFeeId(feeId);
+        List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Assert.listOnlyOne(tmpFeeDtos, "费用不存在");
+
+        //todo 查询 缴费明细
+        FeeDetailDto feeDetailDto = new FeeDetailDto();
+        feeDetailDto.setCommunityId(feeDto.getCommunityId());
+        feeDetailDto.setFeeId(feeDto.getFeeId());
+        feeDetailDto.setDetailId(detailId);
+        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+
+        Assert.listOnlyOne(feeDetailDtos, "缴费记录不存在");
+
+        //todo 计算每月单价
+        Double feePrice = payFeeMonthHelp.getMonthFeePrice(feeDto);
+
+        // todo 准备离散的基础数据
+        PayFeeMonthOwnerDto payFeeMonthOwnerDto = payFeeMonthHelp.generatorOwnerRoom(feeDto);
+
+        // todo 删除缴费时间范围内的数据
+        doDeletePayFeeDetailInMonth(feeDto, feeDetailDtos.get(0));
+
+        // todo 生成一段时间内的数据
+        doGeneratorTimeMonthData(feeDto, payFeeMonthOwnerDto, feePrice, feeDetailDtos.get(0).getStartTime(), feeDetailDtos.get(0).getEndTime());
+    }
+
+    @Override
+    public void deleteFeeMonth(String feeId, String communityId) {
+
+        PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
+        payFeeDetailMonthPo.setFeeId(feeId);
+        payFeeDetailMonthPo.setCommunityId(communityId);
+        payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
+    }
+
+    /**
+     * 删除缴费范围内的数据
+     *
+     * @param feeDto
+     * @param feeDetailDto
+     */
+    private void doDeletePayFeeDetailInMonth(FeeDto feeDto, FeeDetailDto feeDetailDto) {
+
+        PayFeeDetailMonthPo payFeeDetailMonthPo = new PayFeeDetailMonthPo();
+        payFeeDetailMonthPo.setFeeId(feeDto.getFeeId());
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(feeDetailDto.getStartTime());
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+        payFeeDetailMonthPo.setCurMonthTime(DateUtil.getFormatTimeStringB(calendar.getTime()));
+        payFeeDetailMonthPo.setCurMonthEndTime(DateUtil.getFormatTimeStringB(feeDetailDto.getEndTime()));
+        payFeeDetailMonthInnerServiceSMOImpl.deletePayFeeDetailMonth(payFeeDetailMonthPo);
+    }
+
+    private void doTmpFeeDtoMonths(String communityId, List<FeeDto> tmpFeeDtos) {
+        for (FeeDto tmpFeeDto : tmpFeeDtos) {
+            try {
+                doGeneratorOrRefreshFeeMonth(tmpFeeDto, communityId);
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.error("生成费用报表失败" + JSONObject.toJSONString(tmpFeeDto), e);
+            }
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ package com.java110.fee.smo.impl;
 
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
+import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.payFeeDetailMonth.PayFeeDetailMonthDto;
 import com.java110.fee.dao.IPayFeeDetailMonthServiceDao;
 import com.java110.intf.fee.IPayFeeDetailMonthInnerServiceSMO;
@@ -41,8 +42,12 @@ public class PayFeeDetailMonthInnerServiceSMOImpl extends BaseServiceSMO impleme
     @Override
     public int savePayFeeDetailMonths(@RequestBody List<PayFeeDetailMonthPo> payFeeDetailMonthPos) {
         int saveFlag = 1;
+        if (payFeeDetailMonthPos == null || payFeeDetailMonthPos.size() < 1) {
+            return saveFlag;
+        }
+
         Map info = new HashMap();
-        info.put("payFeeDetailMonthPos",payFeeDetailMonthPos);
+        info.put("payFeeDetailMonthPos", payFeeDetailMonthPos);
         payFeeDetailMonthServiceDaoImpl.savePayFeeDetailMonthInfos(info);
         return saveFlag;
     }
@@ -57,8 +62,7 @@ public class PayFeeDetailMonthInnerServiceSMOImpl extends BaseServiceSMO impleme
     @Override
     public int deletePayFeeDetailMonth(@RequestBody PayFeeDetailMonthPo payFeeDetailMonthPo) {
         int saveFlag = 1;
-        payFeeDetailMonthPo.setStatusCd("1");
-        payFeeDetailMonthServiceDaoImpl.updatePayFeeDetailMonthInfo(BeanConvertUtil.beanCovertMap(payFeeDetailMonthPo));
+        payFeeDetailMonthServiceDaoImpl.deletePayFeeDetailMonthInfo(BeanConvertUtil.beanCovertMap(payFeeDetailMonthPo));
         return saveFlag;
     }
 
@@ -97,6 +101,19 @@ public class PayFeeDetailMonthInnerServiceSMOImpl extends BaseServiceSMO impleme
         return payFeeDetailMonths;
     }
 
+    /**
+     * 查询需要离散的 缴费记录
+     *
+     * @param payFeeDetailMonthDto
+     * @return
+     */
+    @Override
+    public List<FeeDetailDto> getWaitDispersedFeeDetail(@RequestBody PayFeeDetailMonthDto payFeeDetailMonthDto) {
+        List<FeeDetailDto> payFeeDetailMonths = BeanConvertUtil.covertBeanList(payFeeDetailMonthServiceDaoImpl.getWaitDispersedFeeDetail(BeanConvertUtil.beanCovertMap(payFeeDetailMonthDto)), FeeDetailDto.class);
+
+        return payFeeDetailMonths;
+    }
+
     public IPayFeeDetailMonthServiceDao getPayFeeDetailMonthServiceDaoImpl() {
         return payFeeDetailMonthServiceDaoImpl;
     }