parent
86f9fd6e99
commit
8abc8bd41f
|
@ -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)
|
||||
|
|
|
@ -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<BusReturnVisitInfo> 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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -41,8 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="phoneEndNumber != null and phoneEndNumber != ''"> and phone_end_number = #{phoneEndNumber}</if>
|
||||
<if test="returnVisitTime != null "> and return_visit_time = #{returnVisitTime}</if>
|
||||
<if test="finishTime != null "> and finish_time = #{finishTime}</if>
|
||||
<if test="beginTime != null and endTime != null"> and order_complete_time between #{beginTime} and #{endTime}</if>
|
||||
<if test="beginTime == null and endTime == null"> and date_format(order_complete_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')</if>
|
||||
<if test="beginTime != null and endTime != null"> and return_visit_time between #{beginTime} and #{endTime}</if>
|
||||
<if test="beginTime == null and endTime == null"> and date_format(return_visit_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d')</if>
|
||||
<if test="storeList != null">
|
||||
and store_code in
|
||||
<foreach collection="storeList" open="(" close=")" item="item" separator="," index="i">
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
</el-select> -->
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="订单完成时间" prop="time">
|
||||
<el-form-item label="营销时间" prop="time">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
value-format="yyyy-MM-dd"
|
||||
|
|
Loading…
Reference in New Issue