diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java index a4d15b47c..4e5798c0d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java @@ -41,15 +41,13 @@ public class WxShopController extends BaseController { @PostMapping("add") public ResultData add(@RequestBody WxShop wxShop) { wxShop.setTenantId(getTenantId()); - wxShopService.saveOrUpdate(wxShop); - return new ResultData(); + return wxShopService.saveOrUpdate(wxShop); } @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody WxShop wxShop) { - wxShopService.saveOrUpdate(wxShop); - return new ResultData(); + return wxShopService.saveOrUpdate(wxShop); } @ApiOperation("根据id删除接口") diff --git a/mallinkService/src/main/java/com/iformall/service/WxShopService.java b/mallinkService/src/main/java/com/iformall/service/WxShopService.java index 31b59d36f..a735edd43 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxShopService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxShopService.java @@ -30,9 +30,9 @@ public interface WxShopService { /** * 保存或更新实体 * - * @param record - */ - void saveOrUpdate(WxShop record); + * @param record + */ + ResultData saveOrUpdate(WxShop record); /** * 根据Id删除实体 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 7574998c3..51fdc43a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumShopStatus; @@ -44,8 +45,7 @@ public class WxShopServiceImpl implements WxShopService { } @Override - public void saveOrUpdate(WxShop record) { - + public ResultData saveOrUpdate(WxShop record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); @@ -54,9 +54,11 @@ public class WxShopServiceImpl implements WxShopService { record.setUpdateDate(date); record.setCreateDate(date); wxShopMapper.insertSelective(record); + return new ResultData(Result.SUCCESS,"添加成功"); } else { record.setUpdateDate(new Date()); wxShopMapper.updateByPrimaryKeySelective(record); + return new ResultData(Result.SUCCESS,"更新成功"); } }