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 e5a6cd2d0..d8225462c 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
@@ -77,8 +77,8 @@ public class WxBrandController extends BaseController {
return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。");
}
}
-
- return wxBrandService.update(wxBrand);
+ wxBrandService.update(wxBrand);
+ return new ResultData(Result.SUCCESS, "操作成功");
}
@GetMapping("/del")
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
index fe457ad52..9d0d98c48 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
@@ -69,6 +69,12 @@ public class WxBrandServiceImpl implements WxBrandService {
@Override
public ResultData update(WxBrand wxBrand) {
+ if(wxBrand.getIsDel().equals(1)){
+ wxBrand.setUpdatetime(new Date());
+ wxBrandMapper.updateByPrimaryKeySelective(wxBrand);
+ return new ResultData(Result.SUCCESS, "操作成功");
+ }
+
if(StringUtils.isEmpty(wxBrand.getName())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"品牌名称不能为空");
}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index 0aabe027e..713f24cf6 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -104,6 +104,9 @@
and `is_del` = #{isDel}
+
+ and `brand` = #{brand}
+
and id not in(
select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is