优化退费逻辑

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

@@ -376,7 +376,7 @@ public class FeeBMOImpl extends ApiBaseBMO implements IFeeBMO {
         if (feeDtos == null || feeDtos.size() != 1) {
             throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "查询费用信息失败，未查到数据或查到多条数据");
         }
-
+        feeDto = feeDtos.get(0);
         paramInJson.put("feeInfo", feeDto);
         businessFeeDetail.put("startTime", DateUtil.getFormatTimeString(feeDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
         Date endTime = feeDto.getEndTime();

service-api/src/main/java/com/java110/api/listener/returnPayFee/ListReturnPayFeesListener.java

@@ -66,22 +66,10 @@ public class ListReturnPayFeesListener extends AbstractServiceApiListener {
 
         int count = returnPayFeeInnerServiceSMOImpl.queryReturnPayFeesCount(returnPayFeeDto);
 
-        List<ApiReturnPayFeeDataVo> returnPayFees = new ArrayList<>();
+        List<ApiReturnPayFeeDataVo> returnPayFees = null;
 
         if (count > 0) {
-            List<ApiReturnPayFeeDataVo> apiReturnPayFeeDataVos = BeanConvertUtil.covertBeanList(returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto), ApiReturnPayFeeDataVo.class);
-            for (ApiReturnPayFeeDataVo apiReturnPayFeeDataVo : apiReturnPayFeeDataVos) {
-                //获取周期
-                String cycles = apiReturnPayFeeDataVo.getCycles();
-                //获取应付金额
-                String receivableAmount = apiReturnPayFeeDataVo.getReceivableAmount();
-                //获取实付金额
-                String receivedAmount = apiReturnPayFeeDataVo.getReceivedAmount();
-                apiReturnPayFeeDataVo.setCycles(cycles.substring(1));
-                apiReturnPayFeeDataVo.setReceivableAmount(receivableAmount.substring(1));
-                apiReturnPayFeeDataVo.setReceivedAmount(receivedAmount.substring(1));
-                returnPayFees.add(apiReturnPayFeeDataVo);
-            }
+            returnPayFees = BeanConvertUtil.covertBeanList(returnPayFeeInnerServiceSMOImpl.queryReturnPayFees(returnPayFeeDto), ApiReturnPayFeeDataVo.class);
         } else {
             returnPayFees = new ArrayList<>();
         }
@@ -97,4 +85,4 @@ public class ListReturnPayFeesListener extends AbstractServiceApiListener {
         context.setResponseEntity(responseEntity);
 
     }
-}
+}

service-api/src/main/java/com/java110/api/listener/returnPayFee/UpdateReturnPayFeeListener.java

@@ -83,18 +83,14 @@ public class UpdateReturnPayFeeListener extends AbstractServiceApiPlusListener {
 
             Assert.listOnlyOne(feeDtos, "费用不存在");
             FeeDto feeDto1 = feeDtos.get(0);
-            Calendar endCalender = Calendar.getInstance();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            endCalender.setTime(feeDto1.getEndTime());
-            endCalender.add(Calendar.MONTH, new Double(cycles).intValue());
-            reqJson.put("endTime", sdf.format(endCalender.getTime()));
+            reqJson.put("endTime", DateUtil.getFormatTimeString(feeDetailDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
             reqJson.put("amount", feeDto1.getAmount());
             reqJson.put("feeTypeCd", feeDto1.getFeeTypeCd());
             reqJson.put("communityId", feeDto1.getCommunityId());
             reqJson.put("payerObjId", feeDto1.getPayerObjId());
             reqJson.put("incomeObjId", feeDto1.getIncomeObjId());
-            endCalender.setTime(feeDto1.getStartTime());
-            reqJson.put("startTime", sdf.format(endCalender.getTime()));
+            reqJson.put("startTime", sdf.format(feeDto1.getStartTime()));
             reqJson.put("userId", feeDto1.getUserId());
             reqJson.put("feeFlag", feeDto1.getFeeFlag());
             reqJson.put("statusCd", feeDto1.getStatusCd());