From a8d357ed3ae3cc5e8770658119e36bd81fe912d2 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Sun, 2 Jul 2023 15:29:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/WxMerchantController.java | 1 + .../impl/WxMerchantRelationServiceImpl.java | 27 ++++++++----------- 2 files changed, 12 insertions(+), 16 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 1df48c3e6..d5ae63792 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -103,6 +103,7 @@ 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()); 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 075d16fca..404429666 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantRelationServiceImpl.java @@ -63,25 +63,20 @@ public class WxMerchantRelationServiceImpl implements WxMerchantRelationService wxMerchantRelationMapper.updateByMerchantIds(updateList,regionId); } if (!CollectionUtils.isEmpty(insertList)) { - insertInfo(regionId, insertList, tenantId); - } - return new ResultData(Result.SUCCESS, "编辑成功", null); - } - - public void insertInfo(Long regionId, List ids, String tenantId) { - List list = new ArrayList<>(); - for (Long id : ids) { - WxMerchantRelation relation = new WxMerchantRelation(); - relation.setId(IdWorker.get().nextId()); - relation.setMerchantId(id); - relation.setRegionMerchantId(regionId); - relation.setTenantId(tenantId); - list.add(relation); + List list = new ArrayList<>(); + for (Long id : ids) { + WxMerchantRelation relation = new WxMerchantRelation(); + relation.setId(IdWorker.get().nextId()); + relation.setMerchantId(id); + relation.setRegionMerchantId(regionId); + relation.setTenantId(tenantId); + list.add(relation); + } + wxMerchantRelationMapper.insertBatch(list); } - wxMerchantRelationMapper.insertBatch(list); + return new ResultData(Result.SUCCESS, "成功", null); } - @Override public void deleteByMerchantId(Long merchantId) { wxMerchantRelationMapper.deleteByMerchantId(merchantId);