From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-fee/src/main/java/com/java110/fee/api/ApplyRoomDiscountApi.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 d7ee08f..5eeb08d 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
@@ -95,12 +95,16 @@
//鑾峰彇鏈濉啓鐨勫紑濮嬫椂闂�
Date startDate = simpleDateFormat.parse(applyRoomDiscountPo.getStartTime());
if (applyRoomDiscountDtos.size() == 0) {
+ //绌虹疆鎴夸紭鎯犲彲鐢�
+ applyRoomDiscountPo.setInUse("0");
return saveApplyRoomDiscountBMOImpl.save(applyRoomDiscountPo);
} else if (applyRoomDiscountDtos.size() > 0) {
//鍙栧嚭缁撴潫鏃堕棿
String endTime = applyRoomDiscountDtos.get(0).getEndTime();
Date finishTime = simpleDateFormat.parse(endTime);
if (startDate.getTime() - finishTime.getTime() >= 0) {
+ //绌虹疆鎴夸紭鎯犲彲鐢�
+ applyRoomDiscountPo.setInUse("0");
return saveApplyRoomDiscountBMOImpl.save(applyRoomDiscountPo);
} else {
throw new UnsupportedOperationException("璇ユ椂闂存宸茬粡鐢宠杩囩┖缃埧锛岃閲嶆柊杈撳叆绌虹疆鎴跨敵璇峰紑濮嬪拰缁撴潫鏃堕棿");
@@ -142,6 +146,25 @@
}
/**
+ * 淇敼浼樻儬鐢宠
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /applyRoomDiscount/editApplyRoomDiscount
+ * @path /app/applyRoomDiscount/editApplyRoomDiscount
+ */
+ @RequestMapping(value = "/editApplyRoomDiscount", method = RequestMethod.POST)
+ public ResponseEntity<String> editApplyRoomDiscount(@RequestBody JSONObject reqJson, @RequestHeader(value = "user-id") String userId) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+ Assert.hasKeyAndValue(reqJson, "state", "璇锋眰鎶ユ枃涓湭鍖呭惈楠屾埧鐘舵��");
+ Assert.hasKeyAndValue(reqJson, "startTime", "璇锋眰鎶ユ枃涓湭鍖呭惈寮�濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqJson, "endTime", "璇锋眰鎶ユ枃涓湭鍖呭惈缁撴潫鏃堕棿");
+ Assert.hasKeyAndValue(reqJson, "ardId", "ardId涓嶈兘涓虹┖");
+ ApplyRoomDiscountPo applyRoomDiscountPo = BeanConvertUtil.covertBean(reqJson, ApplyRoomDiscountPo.class);
+ return updateApplyRoomDiscountBMOImpl.update(applyRoomDiscountPo);
+ }
+
+ /**
* 瀹℃壒鎺ュ彛
*
* @param reqJson
--
Gitblit v1.8.0