From 8abc8bd41f1aa460bf1be64255aa424b21f9245a Mon Sep 17 00:00:00 2001 From: wangshuai Date: Thu, 25 Jul 2024 12:43:52 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E8=B4=A6=E5=88=86=E6=B6=88=E8=80=97?= =?UTF-8?q?=E5=8A=A0=E8=90=A5=E9=94=80=E6=89=8B=E6=9C=BA=E5=8F=B7=202?= =?UTF-8?q?=EF=BC=9B=E5=9B=9E=E8=AE=BF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BA=E8=90=A5=E9=94=80=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/business/domain/BusIntegralRecord.java | 11 +++++++++++ .../business/service/impl/AiServiceImpl.java | 16 +++++++++++++++- .../mapper/business/BusReturnVisitInfoMapper.xml | 4 ++-- ruoyi-ui/src/views/statistics/visit/index.vue | 2 +- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java index 27d8fd0..7e04946 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java @@ -61,6 +61,7 @@ public class BusIntegralRecord extends BaseEntity @Excel(name = "代理备注") private String agentRemark; + private String remark; public void setId(Long id) { this.id = id; @@ -134,6 +135,16 @@ public class BusIntegralRecord extends BaseEntity return agentRemark; } + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 ddeb5b0..cef54dd 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 @@ -372,11 +372,13 @@ public class AiServiceImpl implements IAiService { record.setUpdateType("消耗账分"); record.setIntegralUpdateNum(a); record.setIntegralBalance(reduce); + record.setRemark(busOrderInfo.getPrivcyPhone()); integralRecordService.insertBusIntegralRecord(record); }else{ System.out.println("未配置营销渠道====================="); } }else { + System.out.println("15天拦截====================="); BusAgentInfo busAgentInfo = agentInfoL.get(0); int a = 1; int reduce = busAgentInfo.getAiDurationBalance() - a; @@ -389,11 +391,13 @@ public class AiServiceImpl implements IAiService { record.setUpdateType("消耗账分"); record.setIntegralUpdateNum(a); record.setIntegralBalance(reduce); + record.setRemark(busOrderInfo.getPrivcyPhone()); integralRecordService.insertBusIntegralRecord(record); returnVisitInfo.setIsCharging("1"); } List list2 = busReturnVisitInfoMapper.selectBusReturnVisitInfoList(returnVisitInfo); if (list2.size() > 0) { + System.out.println("修改营销事件====================="); returnVisitInfo.setId(list2.get(0).getId()); returnVisitInfo.setReturnVisitTime(new Date()); busReturnVisitInfoMapper.updateBusReturnVisitInfo(returnVisitInfo); @@ -408,7 +412,16 @@ public class AiServiceImpl implements IAiService { public void sms() { String content = sysDictDataMapper.selectDictLabel("bus_default_sms_script","default_script"); BusOrderInfo busOrderInfo = orderInfoService.selectBusOrderInfoById(1L); - sendSmsTask(content,busOrderInfo); + String phoneNo = busOrderInfo.getPrivcyPhone().split(",")[0];//#分机号# + content = content.replaceAll("分机号",busOrderInfo.getPrivcyPhone().split(",")[1]); + com.alibaba.fastjson.JSONObject jsonObject = busTencentProperties.smsCredential(phoneNo, content); + System.out.println(jsonObject); + if("00".equals(jsonObject.getString("status"))){ + //定时任务15天之前的删除记录 todo + System.out.println("发送成功========"); + }else{ + System.out.println("发送失败========"); + } } private synchronized void sendSmsTask(String content, BusOrderInfo busOrderInfo) { @@ -511,6 +524,7 @@ public class AiServiceImpl implements IAiService { record.setUpdateType("消耗账分"); record.setIntegralUpdateNum(a); record.setIntegralBalance(reduce); + record.setRemark(orderInfo.getPrivcyPhone()); integralRecordService.insertBusIntegralRecord(record); } } diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml index 9abb840..800c99a 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml @@ -41,8 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and phone_end_number = #{phoneEndNumber} and return_visit_time = #{returnVisitTime} and finish_time = #{finishTime} - and order_complete_time between #{beginTime} and #{endTime} - and date_format(order_complete_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') + and return_visit_time between #{beginTime} and #{endTime} + and date_format(return_visit_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') and store_code in diff --git a/ruoyi-ui/src/views/statistics/visit/index.vue b/ruoyi-ui/src/views/statistics/visit/index.vue index 646c083..68170d8 100644 --- a/ruoyi-ui/src/views/statistics/visit/index.vue +++ b/ruoyi-ui/src/views/statistics/visit/index.vue @@ -43,7 +43,7 @@ --> - +