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
SELECT
@@ -213,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sd.last_five_star_reviews_num lastFiveStarReviewsNum,
sd.last_return_visit_num lastReturnVisitNum,
ifnull(round((sd.last_positive_reviews_num/sd.last_return_visit_num)*100,2),0) as lastReturnVisitRate,
+ ifnull(sdd.ct,0) todayReturnVisitNum,
ifnull(sd.score,'-') score,
s.bind_time bindTime,
CONCAT(sc.min_order_num,'~',sc.max_order_num) returnVisitUserRange,
@@ -225,6 +227,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bus_store_info s
LEFT JOIN bus_store_day_info sd ON s.id = sd.store_id
LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code
+ LEFT JOIN (
+ select rv.store_code,count(rv.id) ct
+ from bus_return_visit_info rv
+ where rv.return_visit_time between CONCAT(CURDATE(), ' 00:00:00') AND CONCAT(CURDATE(), ' 23:59:59')
+ group by rv.store_code
+ ) sdd ON sdd.store_code = s.store_code
where s.self_delivery_status != '3'
and s.self_delivery_status = #{selfDeliveryStatus}
and s.sale_bind_id = #{saleBindId}
@@ -270,6 +278,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