优化费用详情

java110-bean/src/main/java/com/java110/po/fee/PayFeeDetailPo.java

@@ -20,6 +20,8 @@ public class PayFeeDetailPo implements Serializable {
     private String receivedAmount;
     private String primeRate;
     private String remark;
+    private String startTime;
+    private String endTime;
 
     private String state;
 
@@ -94,4 +96,20 @@ public class PayFeeDetailPo implements Serializable {
     public void setState(String state) {
         this.state = state;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -28,6 +28,8 @@ public class ApiFeeDetailDataVo extends Vo {
     private String createTime;
     private String state;
     private String stateName;
+    private String startTime;
+    private String endTime;
 
 
     public String getPrimeRate() {
@@ -118,4 +120,20 @@ public class ApiFeeDetailDataVo extends Vo {
     public void setStateName(String stateName) {
         this.stateName = stateName;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

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

@@ -10,9 +10,9 @@
         business_pay_fee_detail(
             operate,prime_rate,detail_id,
             receivable_amount,cycles,remark,
-            received_amount,community_id,b_id,fee_id,state) values (
+            received_amount,community_id,b_id,fee_id,state,start_time,end_time) values (
             #{operate},#{primeRate},#{detailId},#{receivableAmount},
-            #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state})
+            #{cycles},#{remark},#{receivedAmount},#{communityId},#{bId},#{feeId},#{state},#{startTime},#{endTime})
        </insert>
 
 
@@ -24,7 +24,7 @@
             t.receivable_amount receivableAmount,t.cycles,
             t.remark,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.state
+            t.fee_id,t.fee_id feeId,t.state,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
         from business_pay_fee_detail t
         where 1 =1
         <if test="operate !=null and operate != ''">
@@ -65,8 +65,8 @@
     <insert id="saveFeeDetailInfoInstance" parameterType="Map">
         insert into
             pay_fee_detail(
-                prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state) select
-        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state
+                prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time) select
+        t.prime_rate,t.detail_id,t.receivable_amount,t.cycles,t.remark,'0',t.received_amount,t.community_id,t.b_id,t.fee_id,state,t.start_time,t.end_time
         from business_pay_fee_detail t where 1=1
         and t.operate= 'ADD'
         <if test="primeRate !=null and primeRate != ''">
@@ -108,7 +108,7 @@
             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.state,d.name stateName,t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
         from pay_fee_detail t
         left join t_dict d on t.state = d.status_cd and d.table_name = 'pay_fee_detail' and d.table_columns = 'state'
         where 1 =1
@@ -246,8 +246,9 @@
     <insert id="saveFeeDetail" parameterType="Map">
         insert into
         pay_fee_detail(
-        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state)
-        values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},'0',#{receivedAmount},#{communityId},'-1',#{feeId},#{state})
+        prime_rate,detail_id,receivable_amount,cycles,remark,status_cd,received_amount,community_id,b_id,fee_id,state,start_time,end_time)
+        values(#{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},'0',#{receivedAmount},#{communityId},'-1',#{feeId},#{state},
+        #{startTime},#{endTime})
 
     </insert>
 

service-api/src/main/java/com/java110/api/bmo/fee/impl/FeeBMOImpl.java

@@ -92,7 +92,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
     public void updateFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
         PayFeePo payFeePo = BeanConvertUtil.covertBean(paramInJson, PayFeePo.class);
 
-        super.update(dataFlowContext,payFeePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
+        super.update(dataFlowContext, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_FEE_INFO);
     }
 
     /**
@@ -123,7 +123,20 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "查询费用信息失败，未查到数据或查到多条数据");
         }
 
+
         feeDto = feeDtos.get(0);
+        businessFeeDetail.put("startTime", DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
+        Date endTime = feeDto.getEndTime();
+        Calendar endCalender = Calendar.getInstance();
+        endCalender.setTime(endTime);
+        int hours = 0;
+        if ("-101".equals(paramInJson.getString("cycles"))) {
+            hours = new Double(Double.parseDouble(paramInJson.getString("tmpCycles")) * DateUtil.getCurrentMonthDay() * 24).intValue();
+            endCalender.add(Calendar.HOUR, hours);
+        } else {
+            endCalender.add(Calendar.MONTH, Integer.parseInt(paramInJson.getString("cycles")));
+        }
+        businessFeeDetail.put("endTime", DateUtil.getFormatTimeString(endCalender.getTime(), DateUtil.DATE_FORMATE_STRING_A));
         paramInJson.put("feeInfo", feeDto);
 
         BigDecimal feePrice = new BigDecimal("0.00");

service-fee/src/main/java/com/java110/fee/listener/detail/AbstractFeeDetailBusinessServiceDataFlowListener.java

@@ -46,6 +46,8 @@ public abstract class AbstractFeeDetailBusinessServiceDataFlowListener extends A
         businessFeeDetailInfo.put("receivedAmount", businessFeeDetailInfo.get("received_amount"));
         businessFeeDetailInfo.put("communityId", businessFeeDetailInfo.get("community_id"));
         businessFeeDetailInfo.put("feeId", businessFeeDetailInfo.get("fee_id"));
+        businessFeeDetailInfo.put("startTime", businessFeeDetailInfo.get("start_time"));
+        businessFeeDetailInfo.put("endTime", businessFeeDetailInfo.get("end_time"));
         businessFeeDetailInfo.remove("bId");
         businessFeeDetailInfo.put("statusCd", statusCd);
     }
@@ -79,6 +81,8 @@ public abstract class AbstractFeeDetailBusinessServiceDataFlowListener extends A
         currentFeeDetailInfo.put("receivedAmount", currentFeeDetailInfo.get("received_amount"));
         currentFeeDetailInfo.put("communityId", currentFeeDetailInfo.get("community_id"));
         currentFeeDetailInfo.put("feeId", currentFeeDetailInfo.get("fee_id"));
+        currentFeeDetailInfo.put("startTime", currentFeeDetailInfo.get("start_time"));
+        currentFeeDetailInfo.put("endTime", currentFeeDetailInfo.get("end_time"));
 
 
         currentFeeDetailInfo.put("operate", StatusConstant.OPERATE_DEL);