From 9a64b5d355c94933d88825f25ffe6ee56559408a Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Sun, 2 Jul 2023 16:06:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxMerchantController.java | 3 +-- .../com/iformall/domain/po/WxMerchantRelation.java | 10 ---------- .../iformall/service/WxMerchantRelationService.java | 3 ++- .../service/impl/WxMerchantRelationServiceImpl.java | 7 ++++--- .../main/resources/mapper/WxMerchantRelationMapper.xml | 5 +++-- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index d5ae63792..ac324583b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -103,11 +103,10 @@ public class WxMerchantController extends BaseController { @PostMapping("saveOrUpdate") @SystemControllerLog(description = "区域商户和普通商户关系新增或更新") public ResultData saveOrUpdate(@RequestBody WxMerchantRelation wxMerchantRelation) { - logger.debug(getTenantInfo().toString()); logger.debug("[" + getIpAddr() + "] WxMerchantController::saveOrUpdate"); if (null == wxMerchantRelation) wxMerchantRelation = new WxMerchantRelation(); wxMerchantRelation.updateTenantInfo(getTenantInfo()); - return wxMerchantRelationService.saveOrUpdate(wxMerchantRelation.getRegionMerchantId(),wxMerchantRelation.getMerchantIds(),wxMerchantRelation.getType(),wxMerchantRelation.getTenantId()); + return wxMerchantRelationService.saveOrUpdate(wxMerchantRelation.getRegionMerchantId(),wxMerchantRelation.getMerchantIds(),wxMerchantRelation.getType(),getTenantInfo()); } @ApiOperation("区域商户删除普通商户") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java index 090a11036..39a0d1975 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantRelation.java @@ -25,16 +25,6 @@ public class WxMerchantRelation extends TenantEntity { */ private Long id; - /** - * 租户ID - */ - private String tenantId; - - /** - * 父租户ID - */ - private String parentTenantId; - /** * 区域商户id */ diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantRelationService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantRelationService.java index c0ec38df3..e5bb6def7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantRelationService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantRelationService.java @@ -2,12 +2,13 @@ package com.iformall.service; import com.iformall.common.ResultData; +import com.iformall.domain.po.base.TenantEntity; import java.util.List; public interface WxMerchantRelationService { - ResultData saveOrUpdate(Long regionId, List ids, Integer type, String tenantId); + ResultData saveOrUpdate(Long regionId, List ids, Integer type, TenantEntity tenantEntity); void deleteByMerchantId(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java index 404429666..fe89ccfc7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java @@ -5,6 +5,7 @@ import com.iformall.common.IdWorker; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchantRelation; +import com.iformall.domain.po.base.TenantEntity; import com.iformall.mapper.WxMerchantRelationMapper; import com.iformall.service.WxMerchantRelationService; import com.iformall.service.WxMerchantService; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -30,7 +30,7 @@ public class WxMerchantRelationServiceImpl implements WxMerchantRelationService @Transactional(rollbackFor = {Exception.class}) @Override - public ResultData saveOrUpdate(Long regionId, List ids, Integer type, String tenantId) { + public ResultData saveOrUpdate(Long regionId, List ids, Integer type, TenantEntity tenantEntity) { if (regionId == null) { return new ResultData(Result.ERROR, "区域商户id不能为空"); } @@ -69,7 +69,8 @@ public class WxMerchantRelationServiceImpl implements WxMerchantRelationService relation.setId(IdWorker.get().nextId()); relation.setMerchantId(id); relation.setRegionMerchantId(regionId); - relation.setTenantId(tenantId); + relation.setTenantId(tenantEntity.getTenantId()); + relation.setParentTenantId(tenantEntity.getParentTenantId()); list.add(relation); } wxMerchantRelationMapper.insertBatch(list); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantRelationMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantRelationMapper.xml index d8618c157..1f8851cb9 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantRelationMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantRelationMapper.xml @@ -24,13 +24,14 @@ - insert into wx_merchant_relation (id, tenant_id,merchant_id,region_merchant_id ) + insert into wx_merchant_relation (id, tenant_id,merchant_id,region_merchant_id,parent_tenant_id) values (#{item.id}, #{item.tenantId}, #{item.merchantId}, - #{item.regionMerchantId}) + #{item.regionMerchantId}, + #{item.parentTenantId})