optimize

java110-bean/src/main/java/com/java110/dto/payFeeDetailMonth/PayFeeDetailMonthDto.java

@@ -45,6 +45,10 @@ public class PayFeeDetailMonthDto extends PageDto implements Serializable {
 
     private String curMonthTime;
 
+    private String feeName;
+    private String configId;
+
+
 
     public String getDetailMonth() {
         return detailMonth;
@@ -206,4 +210,20 @@ public class PayFeeDetailMonthDto extends PageDto implements Serializable {
     public void setCurMonthTime(String curMonthTime) {
         this.curMonthTime = curMonthTime;
     }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
+
+    public String getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
 }

java110-bean/src/main/java/com/java110/po/payFeeDetailMonth/PayFeeDetailMonthPo.java

@@ -31,6 +31,9 @@ public class PayFeeDetailMonthPo implements Serializable {
 
     private String curMonthEndTime;
 
+    private String feeName;
+    private String configId;
+
 
     public String getDetailMonth() {
         return detailMonth;
@@ -199,4 +202,20 @@ public class PayFeeDetailMonthPo implements Serializable {
     public void setCurMonthEndTime(String curMonthEndTime) {
         this.curMonthEndTime = curMonthEndTime;
     }
+
+    public String getFeeName() {
+        return feeName;
+    }
+
+    public void setFeeName(String feeName) {
+        this.feeName = feeName;
+    }
+
+    public String getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
 }

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

@@ -7,9 +7,12 @@
     <!-- 保存月缴费表信息 add by wuxw 2018-07-03 -->
     <insert id="savePayFeeDetailMonthInfo" parameterType="Map">
         insert into pay_fee_detail_month(
-        detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id
+        detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
+        obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
+        fee_name,config_id
         ) values (
-        #{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId}
+        #{detailMonth},#{detailYear},#{detailId},#{receivableAmount},#{discountAmount},#{remark},#{receivedAmount},#{communityId},#{feeId},#{monthId},
+        #{objName},#{objId},#{ownerName},#{ownerId},#{link},#{state},#{payFeeTime},#{curMonthTime}, #{feeName},#{configId}
         )
     </insert>
 
@@ -17,13 +20,15 @@
     <insert id="savePayFeeDetailMonthInfos" parameterType="Map">
         insert into pay_fee_detail_month(
         detail_month,detail_year,detail_id,receivable_amount,discount_amount,remark,received_amount,community_id,fee_id,month_id,
-        obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time
+        obj_name,obj_id,owner_name,owner_id,link,state,pay_fee_time,cur_month_time,
+        fee_name,config_id
         ) values
         <foreach collection="payFeeDetailMonthPos" item="item" index="index" separator=",">
             (
             #{item.detailMonth},#{item.detailYear},#{item.detailId},#{item.receivableAmount},#{item.discountAmount},
             #{item.remark},#{item.receivedAmount},#{item.communityId},#{item.feeId},#{item.monthId},
-            #{item.objName},#{item.objId},#{item.ownerName},#{item.ownerId},#{item.link},#{item.state},#{item.payFeeTime}
+            #{item.objName},#{item.objId},#{item.ownerName},#{item.ownerId},#{item.link},#{item.state},#{item.payFeeTime},#{item.curMonthTime},
+            #{item.feeName},#{item.configId}
             )
         </foreach>
     </insert>

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

@@ -34,4 +34,11 @@ public interface IPayFeeMonthHelp {
      */
     String getFeeDetailId(List<FeeDetailDto> feeDetailDtos, Date time);
 
+    /**
+     * 获取 支付时间
+     * @param feeDetailDtos
+     * @param detailId
+     * @return
+     */
+    String getFeeFeeTime(List<FeeDetailDto> feeDetailDtos, String detailId);
 }

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

@@ -6,6 +6,7 @@ import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.FeeDto;
 import com.java110.dto.payFeeDetailMonth.PayFeeMonthOwnerDto;
 import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.utils.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -125,6 +126,20 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
         return feeDetailDto.getDetailId();
     }
 
+    @Override
+    public String getFeeFeeTime(List<FeeDetailDto> feeDetailDtos, String detailId) {
+
+        if(feeDetailDtos == null || feeDetailDtos.size() < 1){
+            return null;
+        }
+        for (FeeDetailDto feeDetailDto : feeDetailDtos) {
+            if (feeDetailDto.getDetailId().equals(detailId)) {
+                return DateUtil.getFormatTimeStringA(feeDetailDto.getCreateTime());
+            }
+        }
+        return null;
+    }
+
     /**
      * 获取当前缴费记录
      *
@@ -133,6 +148,9 @@ public class PayFeeMonthHelp implements IPayFeeMonthHelp {
      * @return
      */
     private FeeDetailDto getCurFeeDetail(List<FeeDetailDto> feeDetailDtos, Date curDate) {
+        if(feeDetailDtos == null || feeDetailDtos.size() < 1){
+            return null;
+        }
         for (FeeDetailDto feeDetailDto : feeDetailDtos) {
             if (feeDetailDto.getStartTime().getTime() < curDate.getTime() && feeDetailDto.getEndTime().getTime() > curDate.getTime()) {
                 return feeDetailDto;

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

@@ -146,8 +146,12 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
             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);
@@ -160,7 +164,7 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
      */
     @Async
     @Override
-    public void  doGeneratorOrRefreshAllFeeMonth(String communityId) {
+    public void doGeneratorOrRefreshAllFeeMonth(String communityId) {
 
 
         FeeDto feeDto = new FeeDto();
@@ -179,7 +183,7 @@ public class PayFeeMonthImpl implements IPayFeeMonth {
 
         //todo  每次按200条处理
         for (int pageIndex = 0; pageIndex < page; pageIndex++) {
-            feeDto.setPage(pageIndex * max+1);
+            feeDto.setPage(pageIndex * max + 1);
             feeDto.setRow(max);
             List<FeeDto> tmpFeeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
             // 离散费用