diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 89a97f7c1..e80707221 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -100,7 +100,7 @@ public class WxCreditHistoryController extends BaseController { @SystemControllerLog(description = "积分历史-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id,getTenantInfo().getTenantId())); } /** diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index 7876eacee..0f34a83e3 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -9,8 +9,10 @@ import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; -public interface WxCreditHistoryMapper extends CommonMapper { +public interface WxCreditHistoryMapper extends CommonMapper{ + WxCreditHistory selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findList(WxCreditHistory wxCreditHistory); List findListMore(WxCreditHistory wxCreditHistory); @@ -28,4 +30,6 @@ public interface WxCreditHistoryMapper extends CommonMapper findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 931c3d927..ab989cc25 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -186,8 +186,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } @Override - public WxCreditHistory getById(Long id) { - return wxCreditHistoryMapper.selectById(id); + public WxCreditHistory getById(Long id,String tenantId) { + return wxCreditHistoryMapper.selectById(id,tenantId); } @Override @@ -285,7 +285,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { wxCreditHistory = creditHistories.get(0); } if (wxCreditHistory != null) { - num = wxCreditHistoryMapper.deleteById(wxCreditHistory.getId()); + num = wxCreditHistoryMapper.deleteById(wxCreditHistory.getId(),wxCreditHistory.getTenantId()); if (num != 1) { String errMessage = "删除积分历史出错"; logger.error(errMessage + wxCreditHistory.toString()); @@ -307,10 +307,10 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return num; } - @Override - public void deleteById(Long id) { - wxCreditHistoryMapper.deleteById(id); - } +// @Override +// public void deleteById(Long id) { +// wxCreditHistoryMapper.deleteById(id); +// } @Override public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity) { diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index a39d15054..6831a11bd 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -138,6 +138,10 @@ + + + + + delete from wx_credit_history where id = #{id} and tenant_id = #{tenantId} +