From dd9759eaa3dabd3d55943fc0c741fd5018d2d76e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 五月 2023 16:43:29 +0800
Subject: [PATCH] optimize dining

---
 service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java b/service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java
index e66b90b..fc4d6f3 100644
--- a/service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java
+++ b/service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java
@@ -1,7 +1,7 @@
 package com.java110.store.api;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.contractPartya.ContractPartyaDto;
+import com.java110.dto.contract.ContractPartyaDto;
 import com.java110.po.contractPartya.ContractPartyaPo;
 import com.java110.store.bmo.contractPartya.IDeleteContractPartyaBMO;
 import com.java110.store.bmo.contractPartya.IGetContractPartyaBMO;
@@ -36,7 +36,8 @@
      * @path /app/contractPartya/saveContractPartya
      */
     @RequestMapping(value = "/saveContractPartya", method = RequestMethod.POST)
-    public ResponseEntity<String> saveContractPartya(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> saveContractPartya(@RequestHeader(value = "store-id") String storeId,
+                                                     @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
         Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
@@ -44,6 +45,8 @@
 
 
         ContractPartyaPo contractPartyaPo = BeanConvertUtil.covertBean(reqJson, ContractPartyaPo.class);
+        contractPartyaPo.setStoreId(storeId);
+
         return saveContractPartyaBMOImpl.save(contractPartyaPo);
     }
 
@@ -56,7 +59,8 @@
      * @path /app/contractPartya/updateContractPartya
      */
     @RequestMapping(value = "/updateContractPartya", method = RequestMethod.POST)
-    public ResponseEntity<String> updateContractPartya(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> updateContractPartya(@RequestHeader(value = "store-id") String storeId,
+                                                       @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
         Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
@@ -65,6 +69,8 @@
 
 
         ContractPartyaPo contractPartyaPo = BeanConvertUtil.covertBean(reqJson, ContractPartyaPo.class);
+        contractPartyaPo.setStoreId(storeId);
+
         return updateContractPartyaBMOImpl.update(contractPartyaPo);
     }
 
@@ -77,13 +83,15 @@
      * @path /app/contractPartya/deleteContractPartya
      */
     @RequestMapping(value = "/deleteContractPartya", method = RequestMethod.POST)
-    public ResponseEntity<String> deleteContractPartya(@RequestBody JSONObject reqJson) {
+    public ResponseEntity<String> deleteContractPartya(@RequestHeader(value = "store-id") String storeId,
+                                                       @RequestBody JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "communityId", "灏忓尯ID涓嶈兘涓虹┖");
 
         Assert.hasKeyAndValue(reqJson, "partyaId", "partyaId涓嶈兘涓虹┖");
 
 
         ContractPartyaPo contractPartyaPo = BeanConvertUtil.covertBean(reqJson, ContractPartyaPo.class);
+        contractPartyaPo.setStoreId(storeId);
         return deleteContractPartyaBMOImpl.delete(contractPartyaPo);
     }
 
@@ -97,12 +105,18 @@
      */
     @RequestMapping(value = "/queryContractPartya", method = RequestMethod.GET)
     public ResponseEntity<String> queryContractPartya(@RequestHeader(value = "store-id") String storeId,
+                                                      @RequestParam(value = "partyA", required = false) String partyA,
+                                                      @RequestParam(value = "aContacts", required = false) String aContacts,
+                                                      @RequestParam(value = "aLink", required = false) String aLink,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
         ContractPartyaDto contractPartyaDto = new ContractPartyaDto();
         contractPartyaDto.setPage(page);
         contractPartyaDto.setRow(row);
         contractPartyaDto.setStoreId(storeId);
+        contractPartyaDto.setPartyA(partyA);
+        contractPartyaDto.setaContacts(aContacts);
+        contractPartyaDto.setaLink(aLink);
         return getContractPartyaBMOImpl.get(contractPartyaDto);
     }
 }

--
Gitblit v1.8.0