Przeglądaj źródła

[品牌][修改][品牌删除功能]

release_toaliyun_real
luozukai 7 lat temu
rodzic
commit
fd9c29cc4e
3 zmienionych plików z 11 dodań i 2 usunięć
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
  3. +3
    -0
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Wyświetl plik

@@ -77,8 +77,8 @@ public class WxBrandController extends BaseController {
return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。"); return new ResultData(Result.ERROR, "您有未解绑的商户,请先解绑。");
} }
} }
return wxBrandService.update(wxBrand);
wxBrandService.update(wxBrand);
return new ResultData(Result.SUCCESS, "操作成功");
} }


@GetMapping("/del") @GetMapping("/del")


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java Wyświetl plik

@@ -69,6 +69,12 @@ public class WxBrandServiceImpl implements WxBrandService {


@Override @Override
public ResultData update(WxBrand wxBrand) { 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())){ if(StringUtils.isEmpty(wxBrand.getName())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"品牌名称不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"品牌名称不能为空");
} }


+ 3
- 0
mallinkService/src/main/resources/mapper/WxMerchantMapper.xml Wyświetl plik

@@ -104,6 +104,9 @@
<if test=" null != isDel "> <if test=" null != isDel ">
and `is_del` = #{isDel} and `is_del` = #{isDel}
</if> </if>
<if test=" null != brand ">
and `brand` = #{brand}
</if>
<if test=" null != rentShopType "> <if test=" null != rentShopType ">
and id not in( and id not in(
select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is select merchant_id from wx_rent_contract where tenant_id=#{tenantId} and rent_shop_type=1 and merchant_id is


Ładowanie…
Anuluj
Zapisz