From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java
index 8fbcab0..d05eff0 100755
--- a/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java
@@ -6,10 +6,10 @@
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.DataFlowContext;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.applyRoomDiscount.ApplyRoomDiscountDto;
-import com.java110.dto.applyRoomDiscountType.ApplyRoomDiscountTypeDto;
+import com.java110.dto.room.ApplyRoomDiscountDto;
+import com.java110.dto.room.ApplyRoomDiscountTypeDto;
import com.java110.dto.fee.FeeDetailDto;
-import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
+import com.java110.dto.fee.FeeDiscountRuleDto;
import com.java110.fee.bmo.account.IUpdateAccountBMO;
import com.java110.fee.bmo.applyRoomDiscount.IAuditApplyRoomDiscountBMO;
import com.java110.fee.bmo.applyRoomDiscount.IDeleteApplyRoomDiscountBMO;
@@ -24,8 +24,8 @@
import com.java110.intf.fee.IApplyRoomDiscountInnerServiceSMO;
import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
import com.java110.intf.fee.IFeeDiscountRuleInnerServiceSMO;
-import com.java110.po.applyRoomDiscount.ApplyRoomDiscountPo;
-import com.java110.po.applyRoomDiscountType.ApplyRoomDiscountTypePo;
+import com.java110.po.room.ApplyRoomDiscountPo;
+import com.java110.po.room.ApplyRoomDiscountTypePo;
import com.java110.po.file.FileRelPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -310,12 +310,20 @@
}
}
DecimalFormat df = new DecimalFormat("0.00");
- reqJson.put("cashBackAmount", df.format(cashBackAmount));
+ if (StringUtil.isEmpty(reqJson.getString("refundAmount"))) {
+ reqJson.put("cashBackAmount", df.format(cashBackAmount));
+ } else {
+ reqJson.put("cashBackAmount", reqJson.getString("refundAmount"));
+ }
//澶勭悊璐︽埛杩旂幇
JSONArray businesses = new JSONArray();
updateAccountBMOImpl.cashBackAccount(reqJson, dataFlowContext, businesses);
reqJson.put("inUse", 1);
- reqJson.put("returnAmount", df.format(cashBackAmount));
+ if (StringUtil.isEmpty(reqJson.getString("refundAmount"))) {
+ reqJson.put("returnAmount", df.format(cashBackAmount));
+ } else {
+ reqJson.put("returnAmount", reqJson.getString("refundAmount"));
+ }
}
} else {
reqJson.put("inUse", 0);
@@ -415,6 +423,7 @@
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "applyType", required = false) String applyType,
+ @RequestParam(value = "feeId", required = false) String feeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ApplyRoomDiscountDto applyRoomDiscountDto = new ApplyRoomDiscountDto();
@@ -426,6 +435,7 @@
applyRoomDiscountDto.setRoomId(roomId);
applyRoomDiscountDto.setState(state);
applyRoomDiscountDto.setApplyType(applyType);
+ applyRoomDiscountDto.setFeeId(feeId);
return getApplyRoomDiscountBMOImpl.get(applyRoomDiscountDto);
}
--
Gitblit v1.8.0