订单短息发送修改
This commit is contained in:
parent
e3ceb4d975
commit
bdadacb5eb
|
|
@ -123,19 +123,20 @@ public class OrderServiceImpl implements OrderService {
|
|||
}
|
||||
// 更改购物车状态为已下单
|
||||
orderMapper.updateMaStatus(orderDetailDto);
|
||||
if (devPersonPhone != null) {
|
||||
if (devPersonPhone.length() == 11) {
|
||||
JSONObject sendResult = SmsTool.sendSms(new SmsParam(devPersonPhone, "订单编号:" + code + "已下单,请尽快处理。"), BmConfigItems.ANHUI_COMPANY_SMS_KEY);
|
||||
System.out.println("短信发送结果:" + sendResult.toString());
|
||||
} else if (devPersonPhone.length() > 11) {
|
||||
JSONObject sendResult = SmsTool.sendSms(new SmsParam(Sm4Utils.decrypt(devPersonPhone), "订单编号:" + code + "已下单,请尽快处理。"), BmConfigItems.ANHUI_COMPANY_SMS_KEY);
|
||||
System.out.println("短信发送结果:" + sendResult.toString());
|
||||
} else {
|
||||
System.err.println("-----------用户绑定手机号,格式异常!!!---------------");
|
||||
}
|
||||
} else {
|
||||
System.err.println("-----------设备联系人手机号为空!!!---------------");
|
||||
}
|
||||
// if (devPersonPhone != null) {
|
||||
// if (devPersonPhone.length() == 11) {
|
||||
// SmsUtils.smsToken(devPersonPhone, "订单编号:" + code + "已下单,请尽快处理。", "");
|
||||
// JSONObject sendResult = SmsTool.sendSms(new SmsParam(devPersonPhone, "订单编号:" + code + "已下单,请尽快处理。"), BmConfigItems.ANHUI_COMPANY_SMS_KEY);
|
||||
// System.out.println("短信发送结果:" + sendResult.toString());
|
||||
// } else if (devPersonPhone.length() > 11) {
|
||||
// JSONObject sendResult = SmsTool.sendSms(new SmsParam(Sm4Utils.decrypt(devPersonPhone), "订单编号:" + code + "已下单,请尽快处理。"), BmConfigItems.ANHUI_COMPANY_SMS_KEY);
|
||||
// System.out.println("短信发送结果:" + sendResult.toString());
|
||||
// } else {
|
||||
// System.err.println("-----------用户绑定手机号,格式异常!!!---------------");
|
||||
// }
|
||||
// } else {
|
||||
// System.err.println("-----------设备联系人手机号为空!!!---------------");
|
||||
// }
|
||||
}
|
||||
|
||||
Long userid = SecurityUtils.getLoginUser().getUserid();
|
||||
|
|
@ -393,12 +394,12 @@ public class OrderServiceImpl implements OrderService {
|
|||
orderMapper.updateDeviceStatus(dto);
|
||||
}
|
||||
}
|
||||
String sendMessage = sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber(), dtos.get(0).getSellerPhoneNumber()), orderInfoDto.getOrderCode() + "订单,退租成功");
|
||||
if (StringUtils.isBlank(sendMessage)) {
|
||||
System.err.println("短信发送失败");
|
||||
} else {
|
||||
System.out.println("短信发送消息:" + sendMessage);
|
||||
}
|
||||
// String sendMessage = sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber(), dtos.get(0).getSellerPhoneNumber()), orderInfoDto.getOrderCode() + "订单,退租成功");
|
||||
// if (StringUtils.isBlank(sendMessage)) {
|
||||
// System.err.println("短信发送失败");
|
||||
// } else {
|
||||
// System.out.println("短信发送消息:" + sendMessage);
|
||||
// }
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -406,7 +407,7 @@ public class OrderServiceImpl implements OrderService {
|
|||
if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_CANCEL.getStatus().toString())) {
|
||||
if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
|
||||
for (OrderDetailDto dto : dtos) {
|
||||
sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber(), dtos.get(0).getSellerPhoneNumber()), dto.getOrderCode() + "订单已被取消");
|
||||
// sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber(), dtos.get(0).getSellerPhoneNumber()), dto.getOrderCode() + "订单已被取消");
|
||||
dto.setMaStatus(MaStatusEnum.LISTING.getCode().toString());
|
||||
orderMapper.updateDeviceStatus(dto);
|
||||
}
|
||||
|
|
@ -430,7 +431,7 @@ public class OrderServiceImpl implements OrderService {
|
|||
orderMapper.updateDeviceStatus(dto);
|
||||
}
|
||||
}
|
||||
sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber(), dtos.get(0).getSellerPhoneNumber()), orderCode + "订单已完成。");
|
||||
// sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber(), dtos.get(0).getSellerPhoneNumber()), orderCode + "订单已完成。");
|
||||
}
|
||||
}
|
||||
String userName = SecurityUtils.getLoginUser().getUsername();
|
||||
|
|
@ -446,7 +447,7 @@ public class OrderServiceImpl implements OrderService {
|
|||
orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_TERMINATED.getStatus().toString()))
|
||||
{
|
||||
tmTask.setNoticeCompanyId(tmTask.getBuyerCompanyId());
|
||||
sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber()), dtos.get(0).getOrderCode() + "订单已接单,请注意查收。");
|
||||
// sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber()), dtos.get(0).getOrderCode() + "订单已接单,请注意查收。");
|
||||
|
||||
} else if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_RECEIVE.getStatus().toString()) ||
|
||||
orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString()) ||
|
||||
|
|
@ -454,7 +455,7 @@ public class OrderServiceImpl implements OrderService {
|
|||
orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_REPAIRED.getStatus().toString()))
|
||||
{
|
||||
tmTask.setNoticeCompanyId(tmTask.getSellerCompanyId());
|
||||
sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber()), dtos.get(0).getOrderCode() + "订单已接单,请注意查收。");
|
||||
// sendMsgToSms(Arrays.asList(dtos.get(0).getBuyerPhoneNumber()), dtos.get(0).getOrderCode() + "订单已接单,请注意查收。");
|
||||
}
|
||||
tmTaskMapper.updateTaskStatus(tmTask);
|
||||
}
|
||||
|
|
@ -466,9 +467,9 @@ public class OrderServiceImpl implements OrderService {
|
|||
bmMessage.setCreateTime(DateUtils.getNowDate());
|
||||
Map<String, String> maMachineMap = remoteConfig.getDictValue(MaterialConstants.DICT_TYPE_ORDER_STATUS);
|
||||
bmMessage.setMessageContent("您好,您的订单状态已变更为" + maMachineMap.get(orderInfoDto.getOrderStatus()) + ",请及时查看");
|
||||
if (Objects.equals(orderInfoDto.getOrderStatus(), OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString())) {
|
||||
sendMsgToSms(Arrays.asList(dto.getSellerPhoneNumber()), dto.getOrderCode() + "订单已确认收货。");
|
||||
}
|
||||
// if (Objects.equals(orderInfoDto.getOrderStatus(), OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString())) {
|
||||
// sendMsgToSms(Arrays.asList(dto.getSellerPhoneNumber()), dto.getOrderCode() + "订单已确认收货。");
|
||||
// }
|
||||
bmMessage.setMessageType(String.valueOf(MessageTypeEnum.ORDER_MESSAGE.getType()));
|
||||
bmMessage.setUuid(String.valueOf(UUID.randomUUID()));
|
||||
bmMessage.setFromCompany(0L);
|
||||
|
|
|
|||
Loading…
Reference in New Issue