From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java
old mode 100644
new mode 100755
index 84824c5..a7ab76e
--- a/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/feeDiscountRuleSpec/impl/ComputeFeeDiscountBMOImpl.java
@@ -1,7 +1,7 @@
package com.java110.fee.bmo.feeDiscountRuleSpec.impl;
import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.feeDiscount.ComputeDiscountDto;
+import com.java110.dto.fee.ComputeDiscountDto;
import com.java110.fee.bmo.feeDiscountRuleSpec.IComputeFeeDiscountBMO;
import com.java110.fee.smo.impl.FeeDiscountInnerServiceSMOImpl;
import com.java110.vo.ResultVo;
@@ -9,15 +9,15 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.List;
@Service("computeFeeDiscountBMOImpl")
public class ComputeFeeDiscountBMOImpl implements IComputeFeeDiscountBMO {
-
@Autowired
private FeeDiscountInnerServiceSMOImpl feeDiscountInnerServiceSMOImpl;
-
/**
* 璁＄畻鎶樻墸
@@ -30,17 +30,19 @@
* @return
*/
@Override
- public ResponseEntity<String> compute(String feeId, String communityId, double cycles, int page, int row) {
-
+ public ResponseEntity<String> compute(String feeId, String communityId, double cycles, String payerObjId, String payerObjType, String endTime, int page, int row) throws ParseException {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
FeeDetailDto feeDetailDto = new FeeDetailDto();
feeDetailDto.setCommunityId(communityId);
feeDetailDto.setFeeId(feeId);
feeDetailDto.setCycles(cycles + "");
+ feeDetailDto.setPayerObjId(payerObjId);
+ feeDetailDto.setPayerObjType(payerObjType);
+ //缂磋垂寮�濮嬫椂闂翠负涓婃湀鍒版湡鏃堕棿
+ feeDetailDto.setStartTime(simpleDateFormat.parse(endTime));
feeDetailDto.setRow(row);
feeDetailDto.setPage(page);
List<ComputeDiscountDto> computeDiscountDtos = feeDiscountInnerServiceSMOImpl.computeDiscount(feeDetailDto);
return ResultVo.createResponseEntity(computeDiscountDtos);
}
-
-
}
--
Gitblit v1.8.0