优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -109,6 +109,8 @@ public class FeeDto extends PageDto implements Serializable {
 
     private Date deadlineTime;
 
+    private Date maxEndTime;
+
     private Date importFeeEndTime;
 
 
@@ -681,4 +683,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setRateStartTime(String rateStartTime) {
         this.rateStartTime = rateStartTime;
     }
+
+    public Date getMaxEndTime() {
+        return maxEndTime;
+    }
+
+    public void setMaxEndTime(Date maxEndTime) {
+        this.maxEndTime = maxEndTime;
+    }
 }

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

@@ -136,7 +136,7 @@
         configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle,td4.name
         billTypeName,pfa.value importFeeName,ifd.end_time importFeeEndTime,mw.cur_degrees curDegrees,mw.pre_degrees
         preDegrees,
-        mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,mw.price
+        mw.pre_reading_time preReadingTime,mw.cur_reading_time curReadingTime,pfa1.`value` deadlineTime,pfa1.`value` maxEndTime,mw.price
         mwPrice,
         pfa2.`value` ownerName,t.batch_id,t.batch_id batchId
         from pay_fee t

service-api/src/main/java/com/java110/api/listener/fee/UpdateFeeListener.java

@@ -1,93 +0,0 @@
-package com.java110.api.listener.fee;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.api.bmo.fee.IFeeBMO;
-import com.java110.api.listener.AbstractServiceApiPlusListener;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
-import com.java110.dto.fee.FeeDto;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.fee.IFeeInnerServiceSMO;
-import com.java110.po.fee.PayFeePo;
-import com.java110.utils.constant.BusinessTypeConstant;
-import com.java110.utils.constant.ServiceCodeConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import org.slf4j.Logger;
-import com.java110.core.log.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpMethod;
-
-import java.util.List;
-
-/**
- * @ClassName SaveRoomCreateFeeListener
- * @Description TODO 变更费用
- * @Author wuxw
- * @Date 2020/1/31 15:57
- * @Version 1.0
- * add by wuxw 2020/1/31
- **/
-@Java110Listener("updateFeeListener")
-public class UpdateFeeListener extends AbstractServiceApiPlusListener {
-    private static Logger logger = LoggerFactory.getLogger(UpdateFeeListener.class);
-    @Autowired
-    private IFeeBMO feeBMOImpl;
-
-    private static final int DEFAULT_ADD_FEE_COUNT = 200;
-
-    @Autowired
-    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
-
-    @Autowired
-    private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
-
-    @Override
-    public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_UPDATE_FEE;
-    }
-
-    @Override
-    public HttpMethod getHttpMethod() {
-        return HttpMethod.POST;
-    }
-
-    @Override
-    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        // super.validatePageInfo(pd);
-        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
-        Assert.hasKeyAndValue(reqJson, "feeId", "未包含feeId");
-        Assert.hasKeyAndValue(reqJson, "startTime", "未包含开始时间");
-        Assert.hasKeyAndValue(reqJson, "endTime", "未包含结束时间");
-
-        FeeDto feeDto = new FeeDto();
-        feeDto.setCommunityId(reqJson.getString("communityId"));
-        feeDto.setFeeId(reqJson.getString("feeId"));
-
-        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
-
-        Assert.listOnlyOne(feeDtos, "未查询到费用信息 或查询到多条" + reqJson);
-
-    }
-
-    @Override
-    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
-
-        PayFeePo payFeePo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
-        super.update(context, payFeePo, BusinessTypeConstant.BUSINESS_TYPE_ONLY_UPDATE_FEE_INFO);
-    }
-
-    @Override
-    public int getOrder() {
-        return DEFAULT_ORDER;
-    }
-
-    public IRoomInnerServiceSMO getRoomInnerServiceSMOImpl() {
-        return roomInnerServiceSMOImpl;
-    }
-
-    public void setRoomInnerServiceSMOImpl(IRoomInnerServiceSMO roomInnerServiceSMOImpl) {
-        this.roomInnerServiceSMOImpl = roomInnerServiceSMOImpl;
-    }
-}

service-fee/src/main/java/com/java110/fee/cmd/fee/UpdateFeeCmd.java

@@ -17,6 +17,7 @@ import com.java110.po.fee.PayFeePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
@@ -67,6 +68,14 @@ public class UpdateFeeCmd extends Cmd {
             throw new CmdException("修改费用");
         }
 
+        if(reqJson.containsKey("maxEndTime") && !StringUtil.isEmpty(reqJson.getString("maxEndTime"))){
+            FeeAttrPo feeAttrPo = new FeeAttrPo();
+            feeAttrPo.setFeeId(payFeePo.getFeeId());
+            feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME);
+            feeAttrPo.setValue(reqJson.getString("maxEndTime"));
+            feeAttrInnerServiceSMOImpl.updateFeeAttr(feeAttrPo);
+        }
+
         if(!reqJson.containsKey("computingFormula")
                 || !FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(reqJson.getString("computingFormula"))){
             return ;