|
@@ -1,5 +1,6 @@
|
|
|
package com.szwl.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.util.RandomUtil;
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
import com.alibaba.excel.ExcelWriter;
|
|
|
import com.alibaba.excel.write.metadata.WriteSheet;
|
|
@@ -18,16 +19,14 @@ import com.szwl.model.bean.OrderDaoChuDTO;
|
|
|
import com.szwl.model.bo.ChartType;
|
|
|
import com.szwl.model.bo.R;
|
|
|
import com.szwl.model.dto.OrderDto;
|
|
|
-import com.szwl.model.entity.TAdmin;
|
|
|
-import com.szwl.model.entity.TAdminEquipment;
|
|
|
-import com.szwl.model.entity.TEquipment;
|
|
|
-import com.szwl.model.entity.TOrder;
|
|
|
+import com.szwl.model.entity.*;
|
|
|
import com.szwl.model.excel.NewOrderTarget;
|
|
|
import com.szwl.model.excel.OrderTarget;
|
|
|
import com.szwl.model.query.OrderDaoChuParam;
|
|
|
import com.szwl.model.query.OrderStatisticsDTO;
|
|
|
import com.szwl.model.query.StatisticsParam;
|
|
|
import com.szwl.model.utils.DateUtils;
|
|
|
+import com.szwl.service.RefundSendRecordService;
|
|
|
import com.szwl.service.TOrderService;
|
|
|
import com.szwl.util.YunPianSms;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
@@ -58,13 +57,20 @@ import java.util.concurrent.Executors;
|
|
|
*/
|
|
|
@Service
|
|
|
public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> implements TOrderService {
|
|
|
+
|
|
|
@Resource
|
|
|
TOrderMapper tOrderMapper;
|
|
|
+
|
|
|
@Autowired
|
|
|
SzwlFeign szwlFeign;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private RefundSendRecordService refundSendRecordService;
|
|
|
+
|
|
|
private static final String appid = "07784f5fedb508046c841b391005b7de";
|
|
|
|
|
|
+ private static final String CALLBACK_URL = "https://sz.sunzee.com.cn/ORDER-SERVER/refundSendRecord/callBack";
|
|
|
+
|
|
|
//首页统计
|
|
|
@Override
|
|
|
public ChartColumn getStatistics(StatisticsParam param) {
|
|
@@ -235,16 +241,25 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public String setMessage(Long id, String customerPhone) {
|
|
|
+ public String setMessage(Long id, String customerPhone, Long adminId) {
|
|
|
TOrder order = tOrderMapper.selectById(id);
|
|
|
String result = "";
|
|
|
+ RefundSendRecord refundSendRecord = new RefundSendRecord();
|
|
|
+ String uid = RandomUtil.randomNumbers(18);
|
|
|
+ refundSendRecord.setId(Long.valueOf(uid));
|
|
|
+ refundSendRecord.setCreateDate(new Date());
|
|
|
+ refundSendRecord.setSendAdminId(adminId);
|
|
|
if (order != null) {
|
|
|
String companyType = order.getCompanyType();
|
|
|
String clientId = order.getClientId();
|
|
|
String sn = order.getSn();
|
|
|
+ // 添加发送记录
|
|
|
+ refundSendRecord.setSn(sn);
|
|
|
+ refundSendRecord.setClientId(clientId);
|
|
|
TEquipment equipment = R.getDataIfSuccess(szwlFeign.findEquipmentByClientId(order.getClientId()));
|
|
|
if (equipment == null) {
|
|
|
- return "设备不存在";
|
|
|
+ result = "设备不存在";
|
|
|
+ return result;
|
|
|
}
|
|
|
String operationalPhone = equipment.getOperationalPhone();
|
|
|
String phone = null;
|
|
@@ -260,7 +275,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
phone = admin.getPhone();
|
|
|
}
|
|
|
} else {
|
|
|
- return "账户不存在";
|
|
|
+ result = "账户不存在";
|
|
|
+ return result;
|
|
|
}
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(phone)) {
|
|
@@ -275,19 +291,22 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
|
if (StringUtils.isNotEmpty(companyType) && companyType.equals("1")) {
|
|
|
// 如果是七云科技的用户
|
|
|
result = YunPianSms.sendSms(appid, getScMessage(sn, price, payTime,
|
|
|
- equipment.getName(), clientId6, customerPhone), phone);
|
|
|
+ equipment.getName(), clientId6, customerPhone), phone, uid, CALLBACK_URL);
|
|
|
} else {
|
|
|
// 如果是申泽智能的用户
|
|
|
result = YunPianSms.sendSms(appid, getSzMessage(sn, price, payTime,
|
|
|
- equipment.getName(), clientId6, customerPhone), phone);
|
|
|
+ equipment.getName(), clientId6, customerPhone), phone, uid, CALLBACK_URL);
|
|
|
}
|
|
|
+ refundSendRecord.setPhone(phone);
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- return "发送短信失败";
|
|
|
}
|
|
|
} else {
|
|
|
- return "设备运营者手机号为空";
|
|
|
+ result = "设备运营者手机号为空";
|
|
|
+ return result;
|
|
|
}
|
|
|
+ refundSendRecord.setStatus(0);
|
|
|
+ refundSendRecordService.save(refundSendRecord);
|
|
|
}
|
|
|
return result;
|
|
|
}
|