diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java index 00b496687..cbd515257 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java @@ -63,7 +63,13 @@ public class WxMerchantController extends BaseController public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxMerchantService.getById(id)); } - - + + @ApiOperation("停用") + @GetMapping("disable") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData disable(Long id) { + wxMerchantService.disable(id); + return new ResultData(Result.SUCCESS,"停用成功"); + } } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java index 7ee4890d0..984af8ce3 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgController.java @@ -72,7 +72,7 @@ public class WxMsgController extends BaseController @RequestMapping("/excleupload") - public ResultData courseplanimport(@RequestParam("file") MultipartFile file) { + public ResultData excleupload(@RequestParam("file") MultipartFile file) { if (file.isEmpty()) { return new ResultData(Result.SUCCESS,"上传文件不能为空"); } diff --git a/mallinkService/src/main/java/com/simple/service/WxMerchantService.java b/mallinkService/src/main/java/com/simple/service/WxMerchantService.java index 40f9af375..9965c1059 100644 --- a/mallinkService/src/main/java/com/simple/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/simple/service/WxMerchantService.java @@ -39,4 +39,6 @@ public interface WxMerchantService { void deleteById(Long id); + void disable(Long id); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java index 8c8cc6bc2..70db66d25 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java @@ -51,6 +51,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantMapper.deleteByPrimaryKey(id); } + @Override + public void disable(Long id) { + WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id); + wxMerchant.setStatus(0); + wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant); + } + @Transactional @Override public void saveOrUpdate(WxMerchant wxMerchant) {