From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 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..c62d9bb
--- a/service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/PayFeeConfigDiscountApi.java
@@ -1,18 +1,18 @@
 package com.java110.fee.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.payFeeConfigDiscount.PayFeeConfigDiscountDto;
+import com.java110.dto.payFee.PayFeeConfigDiscountDto;
 import com.java110.fee.bmo.payFeeConfigDiscount.IDeletePayFeeConfigDiscountBMO;
 import com.java110.fee.bmo.payFeeConfigDiscount.IGetPayFeeConfigDiscountBMO;
 import com.java110.fee.bmo.payFeeConfigDiscount.ISavePayFeeConfigDiscountBMO;
 import com.java110.fee.bmo.payFeeConfigDiscount.IUpdatePayFeeConfigDiscountBMO;
-import com.java110.po.payFeeConfigDiscount.PayFeeConfigDiscountPo;
+import com.java110.po.payFee.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.*;
-
 
 @RestController
 @RequestMapping(value = "/payFeeConfigDiscount")
@@ -20,8 +20,10 @@
 
     @Autowired
     private ISavePayFeeConfigDiscountBMO savePayFeeConfigDiscountBMOImpl;
+
     @Autowired
     private IUpdatePayFeeConfigDiscountBMO updatePayFeeConfigDiscountBMOImpl;
+
     @Autowired
     private IDeletePayFeeConfigDiscountBMO deletePayFeeConfigDiscountBMOImpl;
 
@@ -42,9 +44,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