java110 2 éve%!(EXTRA string=óta)
szülő
commit
68ddfb3641

+ 1 - 3
service-fee/src/main/java/com/java110/fee/cmd/meterWater/SaveMeterWaterCmd.java

@@ -99,8 +99,6 @@ public class SaveMeterWaterCmd extends Cmd {
     @Autowired
     private IPayFeeV1InnerServiceSMO payFeeV1InnerServiceSMOImpl;
 
-    @Autowired
-    private IPayFeeMonth payFeeMonthImpl;
 
     @Autowired
     private IFeeAttrInnerServiceSMO feeAttrInnerServiceSMOImpl;
@@ -232,7 +230,7 @@ public class SaveMeterWaterCmd extends Cmd {
             }
             reqJson.put("feeId", payFeePo.getFeeId());
 
-            payFeeMonthImpl.doGeneratorOrRefreshFeeMonth(payFeePo.getFeeId(), reqJson.getString("communityId"));
+
             addMeterWater(reqJson);
         }
         cmdDataFlowContext.setResponseEntity(ResultVo.success());

+ 23 - 9
service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeV1InnerServiceSMOImpl.java

@@ -18,6 +18,7 @@ package com.java110.fee.smo.impl;
 
 import com.java110.dto.fee.PayFeeDto;
 import com.java110.fee.dao.IPayFeeV1ServiceDao;
+import com.java110.fee.feeMonth.IPayFeeMonth;
 import com.java110.intf.fee.IPayFeeV1InnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
 import com.java110.utils.util.BeanConvertUtil;
@@ -44,17 +45,29 @@ public class PayFeeV1InnerServiceSMOImpl extends BaseServiceSMO implements IPayF
     private IPayFeeV1ServiceDao payFeeV1ServiceDaoImpl;
 
 
+    @Autowired
+    private IPayFeeMonth payFeeMonthImpl;
+
+
     @Override
-    public int savePayFee(@RequestBody  PayFeePo PayFeePo) {
-        int saveFlag = payFeeV1ServiceDaoImpl.savePayFeeInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
+    public int savePayFee(@RequestBody PayFeePo payFeePo) {
+        int saveFlag = payFeeV1ServiceDaoImpl.savePayFeeInfo(BeanConvertUtil.beanCovertMap(payFeePo));
+
+        if (saveFlag < 1) {
+            return saveFlag;
+        }
+
+        //todo 离散月报表
+        payFeeMonthImpl.doGeneratorOrRefreshFeeMonth(payFeePo.getFeeId(), payFeePo.getCommunityId());
+
         return saveFlag;
     }
 
-     @Override
-    public int deletePayFee(@RequestBody  PayFeePo PayFeePo) {
-       PayFeePo.setStatusCd("1");
-       int saveFlag = payFeeV1ServiceDaoImpl.updatePayFeeInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
-       return saveFlag;
+    @Override
+    public int deletePayFee(@RequestBody PayFeePo PayFeePo) {
+        PayFeePo.setStatusCd("1");
+        int saveFlag = payFeeV1ServiceDaoImpl.updatePayFeeInfo(BeanConvertUtil.beanCovertMap(PayFeePo));
+        return saveFlag;
     }
 
     @Override
@@ -64,7 +77,7 @@ public class PayFeeV1InnerServiceSMOImpl extends BaseServiceSMO implements IPayF
     }
 
     @Override
-    public List<PayFeeDto> queryPayFees(@RequestBody  PayFeeDto payFeeDto) {
+    public List<PayFeeDto> queryPayFees(@RequestBody PayFeeDto payFeeDto) {
 
         //校验是否传了 分页信息
 
@@ -82,6 +95,7 @@ public class PayFeeV1InnerServiceSMOImpl extends BaseServiceSMO implements IPayF
 
     @Override
     public int queryPayFeesCount(@RequestBody PayFeeDto payFeeDto) {
-        return payFeeV1ServiceDaoImpl.queryPayFeesCount(BeanConvertUtil.beanCovertMap(payFeeDto));    }
+        return payFeeV1ServiceDaoImpl.queryPayFeesCount(BeanConvertUtil.beanCovertMap(payFeeDto));
+    }
 
 }