diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java index d4c40aac4..3235f5748 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java @@ -42,6 +42,7 @@ public class PosPayOrderController extends BaseController { public ResultData add(@RequestBody PosPayOrder posPayOrder) { //Assert.notNull(posPayOrder.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + posPayOrder.updateTenantInfo(getTenantInfo()); posPayOrderService.saveOrUpdate(posPayOrder); return new ResultData(); } @@ -49,23 +50,24 @@ public class PosPayOrderController extends BaseController { @ApiOperation("根据id更新接口") @PostMapping("update") public ResultData update(@RequestBody PosPayOrder posPayOrder) { + posPayOrder.updateTenantInfo(getTenantInfo()); posPayOrderService.saveOrUpdate(posPayOrder); return new ResultData(); } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - public ResultData delete(Long id) { - posPayOrderService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } +// @ApiOperation("根据id删除接口") +// @GetMapping("/del") +// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) +// public ResultData delete(Long id) { +// posPayOrderService.deleteById(id); +// return new ResultData(Result.SUCCESS, "删除成功", null); +// } @ApiOperation("根据id查询接口") @GetMapping("/findById") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS, "查询成功", posPayOrderService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", posPayOrderService.getById(id,getTenantInfo().getTenantId())); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java index e34479bfa..985aacdf1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/PosPayOrderMapper.java @@ -7,6 +7,8 @@ import com.iformall.domain.po.PosPayOrder; public interface PosPayOrderMapper extends CommonMapper { + PosPayOrder selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findList(PosPayOrder posPayOrder); diff --git a/mallinkService/src/main/java/com/iformall/service/PosPayOrderService.java b/mallinkService/src/main/java/com/iformall/service/PosPayOrderService.java index dd64c4aa9..995b7dc2d 100644 --- a/mallinkService/src/main/java/com/iformall/service/PosPayOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/PosPayOrderService.java @@ -31,7 +31,7 @@ public interface PosPayOrderService { * @param id * @return */ - PosPayOrder getById(Long id); + PosPayOrder getById(Long id,String tenantId); /** * 保存或更新实体 @@ -45,7 +45,7 @@ public interface PosPayOrderService { * * @param id */ - void deleteById(Long id); + //void deleteById(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java index b076fc83b..4e0072515 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/PosPayOrderServiceImpl.java @@ -28,8 +28,8 @@ public class PosPayOrderServiceImpl implements PosPayOrderService { } @Override - public PosPayOrder getById(Long id) { - return posPayOrderMapper.selectById(id); + public PosPayOrder getById(Long id,String tenantId) { + return posPayOrderMapper.selectById(id,tenantId); } @Override @@ -45,10 +45,10 @@ public class PosPayOrderServiceImpl implements PosPayOrderService { } } - @Override - public void deleteById(Long id) { - posPayOrderMapper.deleteById(id); - } +// @Override +// public void deleteById(Long id) { +// posPayOrderMapper.deleteById(id); +// } diff --git a/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml index dc14c42b9..2f1e3b6a1 100644 --- a/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/PosPayOrderMapper.xml @@ -115,6 +115,10 @@ order by ${sortColumns} + +