diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java index e60920aa9..2522d4c7a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java @@ -36,6 +36,7 @@ public class WxMsgController extends BaseController { public ResultData list(@ModelAttribute WxMsg wxMsg, Integer pageNum, Integer pageSize) { if (null == wxMsg) wxMsg = new WxMsg(); wxMsg.setTenantId(getTenantId()); + //wxMsg.setWay(EnumSendWay.TAG.getCode()); wxMsg.setSortColumns(WxMsg.Field.Createtime_DESC); final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); return new ResultData(page); diff --git a/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index fe4de06ae..4ddf08bb6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkAdmin/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -1,6 +1,9 @@ package com.iformall.schedule; import com.alibaba.fastjson.JSONObject; +import com.iformall.common.ErrorCode; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMsg; import com.iformall.domain.po.WxMsgConfig; import com.iformall.mapper.WxMsgConfigMapper; @@ -45,6 +48,9 @@ public class MsgSendingSchedule { } public void sendmsg(WxMsg wxMsg){ + + + //从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); wxMsgConfig.setTenantId(wxMsg.getTenantId()); @@ -52,6 +58,17 @@ public class MsgSendingSchedule { if (wxMsgConfigs.size() == 0) return; wxMsgConfig = wxMsgConfigs.get(0); + if(wxMsgConfig.getRemains()==0){ + logger.info("短信数量为0"); + return; + } + + if(wxMsgConfig.getRemains() cUsers) { + + //根据模板ID查询短信信息 + WxMsgModel model = wxMsgModelService.getById(record.getModelId()); + if(model==null){ + return; + } + + WxMsg wxmsg=new WxMsg(); + wxmsg.setTenantId(record.getTenantId()); + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.setTenantId(wxmsg.getTenantId()); + wxMsgConfig = wxMsgConfigService.findObject(wxMsgConfig); + if (wxMsgConfig==null){ + logger.info("您还未接入短信运营商,请联系平台管理员"); + return; + } + + if(wxMsgConfig.getRemains()==0){ + logger.info("短信数量为0"); + return; + } + + wxmsg.setExpectSendNumber(cUsers.size());//预计发送数量 + if(wxMsgConfig.getRemains() cUsers,Long couponInjectId){ //查询标签用户 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java index dc63b2411..aa73fbfac 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgConfigServiceImpl.java @@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.List; + @Service public class WxMsgConfigServiceImpl implements WxMsgConfigService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -45,12 +47,11 @@ public class WxMsgConfigServiceImpl implements WxMsgConfigService { public void deleteById(Long id) { wxMsgConfigMapper.deleteByPrimaryKey(id); } - - - - - - - - + + @Override + public WxMsgConfig findObject(WxMsgConfig wxMsgConfig) { + return wxMsgConfigMapper.selectOne(wxMsgConfig); + } + + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index cc2148b05..aa260b3a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -18,10 +18,7 @@ import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgMapper; import com.iformall.service.WxCUserTagsService; import com.iformall.service.WxMsgService; -import com.iformall.utils.AesUtil; -import com.iformall.utils.HMACSHA256; -import com.iformall.utils.HttpUtil; -import com.iformall.utils.RsaUtil; +import com.iformall.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -113,7 +110,7 @@ public class WxMsgServiceImpl implements WxMsgService { for(String phone:phoneSet){ sb.append(phone).append(","); } - wxMsg.setPhones(sb.toString()); + wxMsg.setPhones(sb.deleteCharAt(sb.length()-1).toString()); //新增记录 if (wxMsg.getId() == null) { @@ -130,14 +127,16 @@ public class WxMsgServiceImpl implements WxMsgService { //是否立即发送 if (wxMsg.getIsright() == 1) { wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); - sendmsg(wxMsg); + wxMsg.setSendtime(DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); + return sendmsg(wxMsg); } else { wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode()); final IdWorker idWorker = IdWorker.get(); - wxMsg.setId(idWorker.nextId()); + long id = idWorker.nextId(); + wxMsg.setId(id); wxMsg.setCreatetime(new Date()); wxMsgMapper.insertSelective(wxMsg); - return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); + return new ResultData(Result.SUCCESS, "短信会在预设时间发送",id); } } else { @@ -150,7 +149,7 @@ public class WxMsgServiceImpl implements WxMsgService { //是否立即发送 if (wxMsg.getIsright() == 1) { wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); - sendmsg(wxMsg); + return sendmsg(wxMsg); } else { //定时 wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode()); @@ -159,8 +158,6 @@ public class WxMsgServiceImpl implements WxMsgService { } } - - return new ResultData(); } private String parselabel(String tenantId, WxMsg wxmsg) { @@ -197,6 +194,17 @@ public class WxMsgServiceImpl implements WxMsgService { if (wxMsgConfigs.size() == 0) return new ResultData(ErrorCode.MSG_SERVER_NOT_FIND, "您还未接入短信运营商,请联系平台管理员"); wxMsgConfig = wxMsgConfigs.get(0); + if(wxMsgConfig.getRemains()==0){ + logger.info("短信数量为0"); + return new ResultData(ErrorCode.MSG_SEND_ERROR.MSG_SUM_ZERO); + } + + if(wxMsgConfig.getRemains() + - `id`,`tenant_id`,`name`,`m_user_id`,`send_type`,`coupon_id`,`coupon_name`,`send_time`,`send_amount`,`status`,`error_msg`,`tags`,`model_id`,`create_time`,`update_time` + `id`,`tenant_id`,`name`,`m_user_id`,`send_type`,`coupon_id`,`coupon_name`,`send_time`,`send_amount`,`status`,`error_msg`,`tags`,`msg_id`,`create_time`,`update_time`,`model_id` @@ -32,7 +33,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id`= #{tenantId} @@ -98,7 +99,11 @@ and `update_time` = #{updateTime} - + + + and `msg_id` = #{msgId} + + and id in diff --git a/mallinkService/src/main/resources/mapper/MallRoleMapper.xml b/mallinkService/src/main/resources/mapper/MallRoleMapper.xml index 6d6aef137..76c387823 100644 --- a/mallinkService/src/main/resources/mapper/MallRoleMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallRoleMapper.xml @@ -22,7 +22,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml b/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml index 84f2bf452..598a42a06 100644 --- a/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallRolePermissionMapper.xml @@ -21,7 +21,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index fa8da2bd7..0fda4504e 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -28,7 +28,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml b/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml index 1e2f8a886..58d33673e 100644 --- a/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAdminLogMapper.xml @@ -23,7 +23,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml index 3a68d1016..3fbd2b4b4 100644 --- a/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxAppinfoMapper.xml @@ -30,7 +30,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml index fb47aa554..f2dff7911 100644 --- a/mallinkService/src/main/resources/mapper/WxBLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBLogMapper.xml @@ -21,7 +21,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml index 8f6cd7d74..e6c0533fb 100644 --- a/mallinkService/src/main/resources/mapper/WxCLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCLogMapper.xml @@ -21,7 +21,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index 60334bbe2..10e441e69 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -25,7 +25,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index d54cfa42d..c1c441b8d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -44,7 +44,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id`= #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml index 997af7c8e..dde98dbc7 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserTagsMapper.xml @@ -23,7 +23,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 31a06f148..07f71166a 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -35,7 +35,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index cd376e8eb..cafe543e9 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -24,7 +24,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 4aec9d3c2..84fa9c33d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -24,7 +24,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index b555dfcc2..621bd71f2 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -30,7 +30,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 836e7509a..9666c9613 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -42,7 +42,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 01205f5e7..34f0666a1 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -29,7 +29,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml index 494ca47a7..2ad32bc22 100644 --- a/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDateAmountRecordMapper.xml @@ -48,7 +48,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 09363ea68..852c28334 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -43,7 +43,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml index 70eb9b81e..57cd17b83 100644 --- a/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallBuildingMapper.xml @@ -24,7 +24,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMallConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMallConfigMapper.xml index 48389df24..e2c7fdd8b 100644 --- a/mallinkService/src/main/resources/mapper/WxMallConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallConfigMapper.xml @@ -24,7 +24,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml index 96c80ec89..e29b3da19 100644 --- a/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallFloorMapper.xml @@ -25,7 +25,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index 26efd64a4..db2c41d40 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -27,7 +27,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml index ba369da12..cbbeb502f 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml @@ -24,7 +24,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml index b2234b5f4..fcf1ec800 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgMapper.xml @@ -20,11 +20,12 @@ + - `id`,`tenant_id`,`model_id`,`msg`,`sendtime`,`createtime`,`expect_send_number`,`success_number`,`error_number`,`return_result`,`phones`,`signature`,`isright`,`name`,`sendstatus`,`excelpath`,`label`,`status` + `id`,`tenant_id`,`model_id`,`msg`,`sendtime`,`createtime`,`expect_send_number`,`success_number`,`error_number`,`return_result`,`phones`,`signature`,`isright`,`name`,`sendstatus`,`excelpath`,`label`,`status`,`way` @@ -108,6 +109,9 @@ and `status` = #{status} + + and `way` = #{way} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index ca2274cce..a4c8fc62f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -36,7 +36,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml index 76e919e01..6f73a3de3 100644 --- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml @@ -29,7 +29,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index 21552f2f6..c6fff3b33 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -34,7 +34,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml index e38bf259b..4e6e62f3d 100644 --- a/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRefundOrderMapper.xml @@ -33,7 +33,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index b0619f2f9..a91b79ab9 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -26,7 +26,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml index b827a704a..b93f8fbd9 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreRulesMapper.xml @@ -29,7 +29,7 @@ and `id` = #{id} - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} and `login_count` = #{loginCount} diff --git a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml index 4badc2bcc..0f1f639ab 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreValidityPeriodMapper.xml @@ -22,7 +22,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 7d8a21fce..d95469841 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -34,7 +34,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} diff --git a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml index 9418925f7..35266adc9 100644 --- a/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml @@ -23,7 +23,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId}