From ab876d19e37aa7c6af400365be347ff4506872de Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 5 Jun 2019 14:17:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=93=81=E7=89=8C=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxBrandController.java | 18 ++++++++++++++++++ .../migration/V201906051403__L_ALTER_RENT.sql | 2 ++ .../com/iformall/domain/po/WxMerchant.java | 4 ++++ .../iformall/service/WxMerchantService.java | 8 ++++++++ .../service/impl/WxMerchantServiceImpl.java | 5 +++++ .../main/resources/mapper/WxMerchantMapper.xml | 7 ++++++- 6 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 50ded68c6..e5a6cd2d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -6,10 +6,13 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBrand; +import com.iformall.domain.po.WxMerchant; import com.iformall.service.WxBrandService; +import com.iformall.service.WxMerchantService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +33,8 @@ public class WxBrandController extends BaseController { @Autowired private WxBrandService wxBrandService; + @Autowired + private WxMerchantService wxMerchantService; @GetMapping("list") @@ -60,6 +65,19 @@ public class WxBrandController extends BaseController { public ResultData update(@RequestBody WxBrand wxBrand) { logger.debug("[" + getIpAddr() + "] WxBrandController::update"); wxBrand.setTenantId(getTenantId()); + + if(wxBrand.getIsDel().equals(1)){ + //判断是否解绑商户 + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setTenantId(wxBrand.getTenantId()); + wxMerchant.setIsDel(0); + wxMerchant.setBrand(wxBrand.getId()); + List merchantList = wxMerchantService.findList(wxMerchant); + if(CollectionUtils.isNotEmpty(merchantList)){ + return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。"); + } + } + return wxBrandService.update(wxBrand); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql new file mode 100644 index 000000000..1e6c799b3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051403__L_ALTER_RENT.sql @@ -0,0 +1,2 @@ +alter table wx_merchant +add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 5bba77043..a9718c198 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -175,6 +175,10 @@ public class WxMerchant extends BaseEntity { @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; + + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") + private Integer isDel; + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index a800957d7..8b85b3cf7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -43,6 +43,14 @@ public interface WxMerchantService { */ List etcpList(WxMerchant record); + /** + * 根据实体查询分页列表 + * + * @param record + * @return + */ + List findList(WxMerchant record); + /** * 查询商户列表 * @param tenantId diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 3eb20c937..70fef769a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -148,6 +148,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantMapper.findList(record); } + @Override + public List findList(WxMerchant record) { + return wxMerchantMapper.findList(record); + } + @Override public List findList(String tenantId) { WxMerchant wxMerchant = new WxMerchant(); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index c341852b4..0aabe027e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -27,12 +27,14 @@ + + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,`qr_code`, - `introduction`,`action_desc` + `introduction`,`action_desc`,is_del @@ -99,6 +101,9 @@ and `is_admin` = #{isAdmin} + + and `is_del` = #{isDel} + and id not in( select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is