| @@ -100,7 +100,7 @@ public class WxCreditHistoryController extends BaseController { | |||||
| @SystemControllerLog(description = "积分历史-查询") | @SystemControllerLog(description = "积分历史-查询") | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById"); | logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::findById"); | ||||
| return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id)); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", wxCreditHistoryService.getById(id,getTenantInfo().getTenantId())); | |||||
| } | } | ||||
| /** | /** | ||||
| @@ -9,8 +9,10 @@ import org.apache.ibatis.annotations.Param; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Long> { | |||||
| public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Long>{ | |||||
| WxCreditHistory selectById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| List<WxCreditHistory> findList(WxCreditHistory wxCreditHistory); | List<WxCreditHistory> findList(WxCreditHistory wxCreditHistory); | ||||
| List<WxCreditHistoryVo> findListMore(WxCreditHistory wxCreditHistory); | List<WxCreditHistoryVo> findListMore(WxCreditHistory wxCreditHistory); | ||||
| @@ -28,4 +30,6 @@ public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Lon | |||||
| long getDecrementCreditAmount(WxCreditHistory wxCreditHistory); | long getDecrementCreditAmount(WxCreditHistory wxCreditHistory); | ||||
| long getPeopleCount(WxCreditHistory wxCreditHistory); | long getPeopleCount(WxCreditHistory wxCreditHistory); | ||||
| int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); | |||||
| } | } | ||||
| @@ -38,7 +38,7 @@ public interface WxCreditHistoryService { | |||||
| * @param id | * @param id | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| WxCreditHistory getById(Long id); | |||||
| WxCreditHistory getById(Long id,String tenantId); | |||||
| /** | /** | ||||
| * 添加积分时,需要校验用户以及手机号是否存在 | * 添加积分时,需要校验用户以及手机号是否存在 | ||||
| @@ -66,7 +66,7 @@ public interface WxCreditHistoryService { | |||||
| * | * | ||||
| * @param id | * @param id | ||||
| */ | */ | ||||
| void deleteById(Long id); | |||||
| //void deleteById(Long id); | |||||
| Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity); | Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity); | ||||
| @@ -186,8 +186,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxCreditHistory getById(Long id) { | |||||
| return wxCreditHistoryMapper.selectById(id); | |||||
| public WxCreditHistory getById(Long id,String tenantId) { | |||||
| return wxCreditHistoryMapper.selectById(id,tenantId); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -285,7 +285,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| wxCreditHistory = creditHistories.get(0); | wxCreditHistory = creditHistories.get(0); | ||||
| } | } | ||||
| if (wxCreditHistory != null) { | if (wxCreditHistory != null) { | ||||
| num = wxCreditHistoryMapper.deleteById(wxCreditHistory.getId()); | |||||
| num = wxCreditHistoryMapper.deleteById(wxCreditHistory.getId(),wxCreditHistory.getTenantId()); | |||||
| if (num != 1) { | if (num != 1) { | ||||
| String errMessage = "删除积分历史出错"; | String errMessage = "删除积分历史出错"; | ||||
| logger.error(errMessage + wxCreditHistory.toString()); | logger.error(errMessage + wxCreditHistory.toString()); | ||||
| @@ -307,10 +307,10 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||||
| return num; | return num; | ||||
| } | } | ||||
| @Override | |||||
| public void deleteById(Long id) { | |||||
| wxCreditHistoryMapper.deleteById(id); | |||||
| } | |||||
| // @Override | |||||
| // public void deleteById(Long id) { | |||||
| // wxCreditHistoryMapper.deleteById(id); | |||||
| // } | |||||
| @Override | @Override | ||||
| public Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity) { | public Map<String, Integer> findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId, TenantEntity tenantEntity) { | ||||
| @@ -138,6 +138,10 @@ | |||||
| </sql> | </sql> | ||||
| <select id="selectById" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns" /> from wx_credit_history where id =#{id} and tenant_id = #{tenantId} | |||||
| </select> | |||||
| <select id="findList" parameterType="com.iformall.domain.po.WxCreditHistory" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxCreditHistory" resultMap="BaseResultMap"> | ||||
| select <include refid="allColumns" /> from wx_credit_history | select <include refid="allColumns" /> from wx_credit_history | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| @@ -259,7 +263,7 @@ | |||||
| </select> | </select> | ||||
| <select id="getPeopleCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Long"> | <select id="getPeopleCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Long"> | ||||
| select count(*) people from ( | |||||
| select count(1) people from ( | |||||
| select count(*) people from wx_credit_history credit | select count(*) people from wx_credit_history credit | ||||
| INNER JOIN wx_c_user_basic_info basic ON basic.id = credit.c_user_id | INNER JOIN wx_c_user_basic_info basic ON basic.id = credit.c_user_id | ||||
| LEFT JOIN wx_merchant merchant ON credit.merchant_id = merchant.id | LEFT JOIN wx_merchant merchant ON credit.merchant_id = merchant.id | ||||
| @@ -267,5 +271,9 @@ | |||||
| group by credit.c_user_id | group by credit.c_user_id | ||||
| ) credit | ) credit | ||||
| </select> | </select> | ||||
| <delete id="deleteById" parameterType="java.util.HashMap"> | |||||
| delete from wx_credit_history where id = #{id} and tenant_id = #{tenantId} | |||||
| </delete> | |||||
| </mapper> | </mapper> | ||||