feats

src/main/java/com/yunzhi/marketing/borker/controller/BkAgreementController.java

@@ -84,9 +84,19 @@ public class BkAgreementController extends BaseController {
         }
 
         bkAgreement.setOrgId(getOrgId(request).toString());
-        bkAgreement.setInstitutionId(CommConstant.ROOT_INSTITUTION);
+        bkAgreement.setInstitutionId(getInstitutionId(bkAgreement.getBuildingId()));
         bkAgreement.setStatus(CommConstant.STATUS_NORMAL);
 
+        // 获取楼盘的佣金规则
+        BkAgreement origin = iBkAgreementService.getByBuilding(bkAgreement.getBuildingId());
+        if (null != origin) {
+            bkAgreement.setRuleId(origin.getRuleId());
+            if (StringUtils.isEmpty(bkAgreement.getCityId())) {
+                bkAgreement.setCityId(origin.getCityId());
+            }
+            return bkAgreementUpdate(origin.getRuleId(), bkAgreement, request);
+        }
+
         if (iBkAgreementService.save(bkAgreement)){
             return ResponseBean.success(bkAgreement);
         } else {
@@ -140,7 +150,7 @@ public class BkAgreementController extends BaseController {
             return ResponseBean.success("success");
         }
 
-        if (!bkAgreement.getOrgId().equals(getOrgId(request).toString())) {
+        if (!getOrgId(request).toString().equals(bkAgreement.getOrgId())) {
             return ResponseBean.error("暂无权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 

src/main/java/com/yunzhi/marketing/borker/entity/BkFirstScreen.java

@@ -30,6 +30,9 @@ public class BkFirstScreen implements Serializable {
     @TableId(value = "screen_id", type = IdType.UUID)
     private String screenId;
 
+    @ApiModelProperty(value = "标题")
+    private String title;
+
     @ApiModelProperty(value = "显示类型")
     private String showType;
 

src/main/java/com/yunzhi/marketing/borker/service/IBkAgreementService.java

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IBkAgreementService extends IService<BkAgreement> {
 
     boolean switchByBuilding(String buildingId, Boolean on);
+
+    BkAgreement getByBuilding(String buildingId);
 }

src/main/java/com/yunzhi/marketing/borker/service/impl/BkAgreementServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.marketing.borker.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yunzhi.marketing.borker.entity.BkAgreement;
 import com.yunzhi.marketing.borker.mapper.BkAgreementMapper;
@@ -28,4 +29,14 @@ public class BkAgreementServiceImpl extends ServiceImpl<BkAgreementMapper, BkAgr
 
         return update(updateWrapper);
     }
+
+    @Override
+    public BkAgreement getByBuilding(String buildingId) {
+        QueryWrapper<BkAgreement> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id", buildingId);
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
 }