diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java index d91331bf0..cbc505a6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java @@ -64,7 +64,7 @@ public class WxCouponActionLogController extends BaseController { @SystemControllerLog(description = "注券记录-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::delete"); - wxCouponActionLogService.deleteById(id); + wxCouponActionLogService.deleteById(id,getTenantInfo().getTenantId()); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -74,7 +74,7 @@ public class WxCouponActionLogController extends BaseController { @SystemControllerLog(description = "注券记录-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxCouponActionLogController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCouponActionLogService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponActionLogService.getById(id,getTenantInfo().getTenantId())); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java index 460e82d8d..588caef75 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java @@ -12,6 +12,10 @@ import com.iformall.domain.po.WxCouponActionLog; public interface WxCouponActionLogMapper extends CommonMapper { + WxCouponActionLog selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findList(WxCouponActionLog wxCouponActionLog); List sceneDataMap(HashMap params); // will be deleted diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java index e18935e21..d2a8046b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponActionLogService.java @@ -25,7 +25,7 @@ public interface WxCouponActionLogService { * @param id * @return */ - WxCouponActionLog getById(Long id); + WxCouponActionLog getById(Long id,String tenantId); /** * 保存或更新实体 @@ -39,7 +39,7 @@ public interface WxCouponActionLogService { * * @param id */ - void deleteById(Long id); + void deleteById(Long id,String tenantId); void addOne(TenantEntity tenantEntity,Long couponId,Long coupon_order_id,int channelType,Long channelId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java index a0fdf0214..251ab5748 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponActionLogServiceImpl.java @@ -34,8 +34,8 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { } @Override - public WxCouponActionLog getById(Long id) { - return wxCouponActionLogMapper.selectById(id); + public WxCouponActionLog getById(Long id,String tenantId) { + return wxCouponActionLogMapper.selectById(id,tenantId); } @Override @@ -51,8 +51,8 @@ public class WxCouponActionLogServiceImpl implements WxCouponActionLogService { } @Override - public void deleteById(Long id) { - wxCouponActionLogMapper.deleteById(id); + public void deleteById(Long id,String tenantId) { + wxCouponActionLogMapper.deleteById(id,tenantId); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index f26652927..d9ee40e4e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -70,6 +70,14 @@ order by ${sortColumns} + + + + delete from wx_coupon_action_log where id = #{id} and tenant_id = #{tenantId} + +