‘linchangsheng’ 6 ماه پیش
والد
کامیت
42262a8470

+ 2 - 1
mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/AgreementAddUp.java

@@ -2,6 +2,7 @@ package com.gree.mall.manager.bean.policy;
 
 import com.gree.mall.manager.plus.entity.Agreement;
 import com.gree.mall.manager.plus.entity.AgreementPolicy;
+import com.gree.mall.manager.plus.entity.Policy;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,5 +14,5 @@ import java.util.List;
 public class AgreementAddUp extends Agreement {
 
     @ApiModelProperty(value = "绑定政策")
-    private List<AgreementPolicy> agreementPolicies;
+    private List<Policy> policy;
 }

+ 18 - 4
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -85,14 +86,21 @@ public class AgreementLogic {
     @Transactional(rollbackFor = Exception.class)
     public void add(AgreementAddUp agreementAddUp) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
+
         agreementAddUp.setCompanyWechatId(adminUser.getCompanyWechatId());
         agreementAddUp.setCompanyWechatName(adminUser.getCompanyName());
         agreementAddUp.insert();
 
-        for (AgreementPolicy agreementPolicy : agreementAddUp.getAgreementPolicies()) {
+        List<AgreementPolicy> agreementPolicies = new ArrayList<>();
+
+        for (Policy policy : agreementAddUp.getPolicy()) {
+            AgreementPolicy agreementPolicy = new AgreementPolicy();
+            agreementPolicy.setPolicyId(policy.getId());
             agreementPolicy.setAgreementId(agreementAddUp.getId());
+
+            agreementPolicies.add(agreementPolicy);
         }
-        agreementPolicyService.saveBatch(agreementAddUp.getAgreementPolicies());
+        agreementPolicyService.saveBatch(agreementPolicies);
     }
 
 
@@ -104,10 +112,16 @@ public class AgreementLogic {
 
         agreementPolicyService.lambdaUpdate().eq(AgreementPolicy::getAgreementId,agreementAddUp.getId()).remove();
 
-        for (AgreementPolicy agreementPolicy : agreementAddUp.getAgreementPolicies()) {
+        List<AgreementPolicy> agreementPolicies = new ArrayList<>();
+
+        for (Policy policy : agreementAddUp.getPolicy()) {
+            AgreementPolicy agreementPolicy = new AgreementPolicy();
+            agreementPolicy.setPolicyId(policy.getId());
             agreementPolicy.setAgreementId(agreementAddUp.getId());
+
+            agreementPolicies.add(agreementPolicy);
         }
-        agreementPolicyService.saveBatch(agreementAddUp.getAgreementPolicies());
+        agreementPolicyService.saveBatch(agreementPolicies);
     }
 
     public MailboxAdd detailMailbox() {