From a5a98017e381def62015bfb8febf379a6d1a110b Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 6 Aug 2024 17:57:07 +0800 Subject: [PATCH] =?UTF-8?q?1;=20=E7=9F=AD=E4=BF=A1=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E5=8A=A0=E6=9C=AC=E5=9C=B0=E9=99=90=E9=A2=9D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=202=EF=BC=9B=E5=BA=97=E9=93=BA=E6=95=B0=E6=8D=AE=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/business/domain/BusSmsInfo.java | 28 ++++++++++++++----- .../business/service/impl/AiServiceImpl.java | 8 ++++-- .../mapper/business/BusSmsInfoMapper.xml | 13 ++++++--- .../mapper/business/BusStoreInfoMapper.xml | 9 ++++++ 4 files changed, 44 insertions(+), 14 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusSmsInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusSmsInfo.java index 4b51508..f0235a5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusSmsInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusSmsInfo.java @@ -24,11 +24,15 @@ public class BusSmsInfo extends BaseEntity /** 充值 */ @Excel(name = "充值") - private Long rechargeNum; + private Integer rechargeNum; /** 限额 */ @Excel(name = "限额") - private Long limitNum; + private Integer limitNum; + + /** 总额 */ + @Excel(name = "总额") + private Integer totalNum; /** 状态 */ @Excel(name = "状态") @@ -64,25 +68,34 @@ public class BusSmsInfo extends BaseEntity { return account; } - public void setRechargeNum(Long rechargeNum) + public void setRechargeNum(Integer rechargeNum) { this.rechargeNum = rechargeNum; } - public Long getRechargeNum() + public Integer getRechargeNum() { return rechargeNum; } - public void setLimitNum(Long limitNum) + public void setLimitNum(Integer limitNum) { this.limitNum = limitNum; } - public Long getLimitNum() + public Integer getLimitNum() { return limitNum; } - public void setStatus(String status) + + public Integer getTotalNum() { + return totalNum; + } + + public void setTotalNum(Integer totalNum) { + this.totalNum = totalNum; + } + + public void setStatus(String status) { this.status = status; } @@ -126,6 +139,7 @@ public class BusSmsInfo extends BaseEntity .append("account", getAccount()) .append("rechargeNum", getRechargeNum()) .append("limitNum", getLimitNum()) + .append("totalNum", getTotalNum()) .append("createTime", getCreateTime()) .append("status", getStatus()) .append("enterpriseId", getEnterpriseId()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index 0c728e0..d47163e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -310,18 +310,20 @@ public class AiServiceImpl implements IAiService { BusSmsInfo busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(num); if(num == null && busSmsInfo1 != null){ redisTemplate.opsForValue().set("limitNum",busSmsInfo1.getLimitNum()+""); + redisTemplate.opsForValue().set("totalNum",busSmsInfo1.getTotalNum()+""); } if(busSmsInfo1 == null){ - redisTemplate.opsForValue().set("limitNum", "0"); - busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum("0"); + String totalNum = redisTemplate.opsForValue().get("totalNum"); + busSmsInfo1 = busSmsInfoMapper.selectBusSmsInfoByNum(totalNum); if(busSmsInfo1 == null){ redisTemplate.delete("limitNum"); + redisTemplate.delete("totalNum"); log.error("短信余额为空，请充值"); return; } } busSmsInfo.setId(busSmsInfo1.getId()); - busSmsInfo.setRechargeNum(busSmsInfo1.getRechargeNum()-1); + busSmsInfo.setRechargeNum(busSmsInfo1.getRechargeNum()+1); busSmsInfoMapper.updateBusSmsInfo(busSmsInfo); String phoneNo = busOrderInfo.getPrivcyPhone().split(",")[0];//#分机号# diff --git a/ruoyi-system/src/main/resources/mapper/business/BusSmsInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusSmsInfoMapper.xml index 94c54a2..4344480 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusSmsInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusSmsInfoMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -17,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, account, recharge_num, limit_num, create_time, status, enterpriseId, appId, appKey from bus_sms_info + select id, account, recharge_num, limit_num,total_num, create_time, status, enterpriseId, appId, appKey from bus_sms_info - where status ='1' and recharge_num > 0 - and recharge_num > #{limitNum, javaType=String, jdbcType=NUMERIC} - order by recharge_num + where status ='1' and recharge_num < total_num + and recharge_num < #{limitNum, javaType=String, jdbcType=NUMERIC} + order by recharge_num desc limit 1 @@ -52,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" account, recharge_num, limit_num, + total_num, create_time, status, enterpriseId, @@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{account}, #{rechargeNum}, #{limitNum}, + #{totalNum}, #{createTime}, #{status}, #{enterpriseId}, @@ -76,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" account = #{account}, recharge_num = #{rechargeNum}, limit_num = #{limitNum}, + total_num = #{totalNum}, create_time = #{createTime}, status = #{status}, enterpriseId = #{enterpriseId}, diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index a44ae95..9a2c59c 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -186,6 +186,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.return_visit_status = #{returnVisitStatus} and s.marketing_channels = #{marketingChannels} and s.bind_id = #{bindId} + ORDER BY s.bind_time desc