From 7a095e5d59a428225caca81738a69603578964a3 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期五, 08 八月 2025 18:33:58 +0800
Subject: [PATCH] 折扣逻辑修改2025/08/08

---
 service-store/src/main/java/com/java110/store/api/ContractPartyaApi.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 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 e4e92c7..6ac1e97 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
@@ -40,13 +40,13 @@
                                                      @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
-        Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
-        Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+//        Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
+//        Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+        Assert.hasKeyAndValue(reqJson, "typeId", "璇锋眰鎶ユ枃涓湭鍖呭惈typeId");
 
 
         ContractPartyaPo contractPartyaPo = BeanConvertUtil.covertBean(reqJson, ContractPartyaPo.class);
         contractPartyaPo.setStoreId(storeId);
-
         return saveContractPartyaBMOImpl.save(contractPartyaPo);
     }
 
@@ -63,8 +63,9 @@
                                                        @RequestBody JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "partyA", "璇锋眰鎶ユ枃涓湭鍖呭惈partyA");
-        Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
-        Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+//        Assert.hasKeyAndValue(reqJson, "aContacts", "璇锋眰鎶ユ枃涓湭鍖呭惈aContacts");
+//        Assert.hasKeyAndValue(reqJson, "aLink", "璇锋眰鎶ユ枃涓湭鍖呭惈aLink");
+        Assert.hasKeyAndValue(reqJson, "typeId", "璇锋眰鎶ユ枃涓湭鍖呭惈typeId");
         Assert.hasKeyAndValue(reqJson, "partyaId", "partyaId涓嶈兘涓虹┖");
 
 
@@ -108,6 +109,7 @@
                                                       @RequestParam(value = "partyA", required = false) String partyA,
                                                       @RequestParam(value = "aContacts", required = false) String aContacts,
                                                       @RequestParam(value = "aLink", required = false) String aLink,
+                                                      @RequestParam(value = "typeId", required = false) String typeId,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
         ContractPartyaDto contractPartyaDto = new ContractPartyaDto();
@@ -117,6 +119,7 @@
         contractPartyaDto.setPartyA(partyA);
         contractPartyaDto.setaContacts(aContacts);
         contractPartyaDto.setaLink(aLink);
+        contractPartyaDto.setTypeId(typeId);
         return getContractPartyaBMOImpl.get(contractPartyaDto);
     }
 }

--
Gitblit v1.8.0