From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java |   58 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java b/service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java
old mode 100644
new mode 100755
index 6117ac8..a7f696d
--- a/service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java
+++ b/service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java
@@ -2,11 +2,9 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.rentingAppointment.RentingAppointmentDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.po.rentingAppointment.RentingAppointmentPo;
-import com.java110.user.bmo.rentingAppointment.IDeleteRentingAppointmentBMO;
-import com.java110.user.bmo.rentingAppointment.IGetRentingAppointmentBMO;
-import com.java110.user.bmo.rentingAppointment.ISaveRentingAppointmentBMO;
-import com.java110.user.bmo.rentingAppointment.IUpdateRentingAppointmentBMO;
+import com.java110.user.bmo.rentingAppointment.*;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,9 +13,8 @@
 
 /**
  * 绉熻祦 棰勭害鎺ュ彛绫� controller
- *
+ * <p>
  * add by 鍚村鏂�
- *
  */
 @RestController
 @RequestMapping(value = "/rentingAppointment")
@@ -33,6 +30,9 @@
     @Autowired
     private IGetRentingAppointmentBMO getRentingAppointmentBMOImpl;
 
+    @Autowired
+    private IConfirmRentingBMO confirmRentingBMOImpl;
+
     /**
      * 寰俊淇濆瓨娑堟伅妯℃澘
      *
@@ -42,7 +42,8 @@
      * @path /app/rentingAppointment/saveRentingAppointment
      */
     @RequestMapping(value = "/saveRentingAppointment", method = RequestMethod.POST)
-    public ResponseEntity<String> saveRentingAppointment(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveRentingAppointment(@RequestBody JSONObject reqJson,
+                                                         @RequestHeader(value = "store-id") String storeId) {
 
         Assert.hasKeyAndValue(reqJson, "tenantName", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantName");
         Assert.hasKeyAndValue(reqJson, "tenantSex", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantSex");
@@ -51,6 +52,7 @@
 
 
         RentingAppointmentPo rentingAppointmentPo = BeanConvertUtil.covertBean(reqJson, RentingAppointmentPo.class);
+        rentingAppointmentPo.setStoreId(storeId);
         return saveRentingAppointmentBMOImpl.save(rentingAppointmentPo);
     }
 
@@ -65,10 +67,10 @@
     @RequestMapping(value = "/updateRentingAppointment", method = RequestMethod.POST)
     public ResponseEntity<String> updateRentingAppointment(@RequestBody JSONObject reqJson) {
 
-        Assert.hasKeyAndValue(reqJson, "tenantName", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantName");
-        Assert.hasKeyAndValue(reqJson, "tenantSex", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantSex");
-        Assert.hasKeyAndValue(reqJson, "tenantTel", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantTel");
-        Assert.hasKeyAndValue(reqJson, "appointmentTime", "璇锋眰鎶ユ枃涓湭鍖呭惈appointmentTime");
+//        Assert.hasKeyAndValue(reqJson, "tenantName", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantName");
+//        Assert.hasKeyAndValue(reqJson, "tenantSex", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantSex");
+//        Assert.hasKeyAndValue(reqJson, "tenantTel", "璇锋眰鎶ユ枃涓湭鍖呭惈tenantTel");
+//        Assert.hasKeyAndValue(reqJson, "appointmentTime", "璇锋眰鎶ユ枃涓湭鍖呭惈appointmentTime");
         Assert.hasKeyAndValue(reqJson, "appointmentId", "appointmentId涓嶈兘涓虹┖");
 
 
@@ -106,11 +108,41 @@
     @RequestMapping(value = "/queryRentingAppointment", method = RequestMethod.GET)
     public ResponseEntity<String> queryRentingAppointment(@RequestHeader(value = "store-id") String storeId,
                                                           @RequestParam(value = "page") int page,
-                                                          @RequestParam(value = "row") int row) {
+                                                          @RequestParam(value = "row") int row,
+                                                          @RequestParam(value = "state", required = false) String state,
+                                                          @RequestParam(value = "tenantName", required = false) String tenantName,
+                                                          @RequestParam(value = "tenantTel", required = false) String tenantTel
+    ) {
         RentingAppointmentDto rentingAppointmentDto = new RentingAppointmentDto();
         rentingAppointmentDto.setPage(page);
         rentingAppointmentDto.setRow(row);
-        rentingAppointmentDto.setStoreId(storeId);
+        if (!StoreDto.STORE_ADMIN.equals(storeId)) {
+            rentingAppointmentDto.setStoreId(storeId);
+        }
+        rentingAppointmentDto.setState(state);
+        rentingAppointmentDto.setTenantName(tenantName);
+        rentingAppointmentDto.setTenantTel(tenantTel);
         return getRentingAppointmentBMOImpl.get(rentingAppointmentDto);
     }
+
+
+    /**
+     * 纭绉熸埧
+     *
+     * @param reqJson
+     * @return
+     * @serviceCode /rentingAppointment/confirmRenting
+     * @path /app/rentingAppointment/confirmRenting
+     */
+    @RequestMapping(value = "/confirmRenting", method = RequestMethod.POST)
+    public ResponseEntity<String> confirmRenting(@RequestBody JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "appointmentId", "appointmentId涓嶈兘涓虹┖");
+        Assert.hasKeyAndValue(reqJson, "rentingId", "rentingId涓嶈兘涓虹┖");
+
+        RentingAppointmentPo rentingAppointmentPo = BeanConvertUtil.covertBean(reqJson, RentingAppointmentPo.class);
+        return confirmRentingBMOImpl.confirm(rentingAppointmentPo);
+    }
+
+
 }

--
Gitblit v1.8.0