From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java
old mode 100644
new mode 100755
index 6f71437..6b94936
--- a/service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java
@@ -9,6 +9,7 @@
import com.java110.po.payFeeConfigDiscount.PayFeeConfigDiscountPo;
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 org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -42,9 +43,15 @@
Assert.hasKeyAndValue(reqJson, "configId", "璇锋眰鎶ユ枃涓湭鍖呭惈configId");
Assert.hasKeyAndValue(reqJson, "discountId", "璇锋眰鎶ユ枃涓湭鍖呭惈discountId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
-
+ Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈startTime");
+ Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈endTime");
PayFeeConfigDiscountPo payFeeConfigDiscountPo = BeanConvertUtil.covertBean(reqJson, PayFeeConfigDiscountPo.class);
+ String paymaxEndTime = reqJson.getString("payMaxEndTime");
+ if (StringUtil.isEmpty(paymaxEndTime)) {
+ //濡傛灉浼樻儬鏈�澶ф椂闂翠负绌猴紝灏遍粯璁や负2037-12-31 00:00:00
+ payFeeConfigDiscountPo.setPayMaxEndTime("2037-12-31 00:00:00");
+ }
return savePayFeeConfigDiscountBMOImpl.save(payFeeConfigDiscountPo);
}
--
Gitblit v1.8.0