From 78ca93d628916ff393d89a341d7d6d73493964f9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 3 Nov 2020 14:47:20 +0800 Subject: [PATCH] xingxingdiandeng --- .../service/impl/WxShopServiceImpl.java | 9 ++++---- .../resources/mapper/WxBillRentMapper.xml | 13 ++++++++--- .../resources/mapper/WxMerchantMapper.xml | 23 +++++++++++-------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 44cd55d08..c8ec382c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -162,11 +162,10 @@ public class WxShopServiceImpl implements WxShopService { updateMerchantShop.setIsDel(EnumDelStatus.DEL.getCode()); wxMerchantShopMapper.updateById(updateMerchantShop); } - } - //else { - //无关联商铺直接删除 - //wxShopMapper.deleteById(id); - //} + } else { +// 无关联商铺直接删除 + wxShopMapper.deleteById(id); + } return new ResultData(Result.SUCCESS, "删除成功"); } diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index e28bd518c..510fadeeb 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -144,15 +144,22 @@