bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单消息

This commit is contained in:
sxu 2025-01-02 16:18:32 +08:00
parent 9dc9a112d9
commit c16f9953ac
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -290,7 +290,7 @@ public class OrderServiceImpl implements OrderService {
BmMessage bmMessage = new BmMessage(); BmMessage bmMessage = new BmMessage();
bmMessage.setCreateTime(DateUtils.getNowDate()); bmMessage.setCreateTime(DateUtils.getNowDate());
Map<String, String> maMachineMap = remoteConfig.getDictValue(MaterialConstants.DICT_TYPE_ORDER_STATUS); Map<String, String> maMachineMap = remoteConfig.getDictValue(MaterialConstants.DICT_TYPE_ORDER_STATUS);
bmMessage.setMessageContent("您好，您的订单状态已变更为" + maMachineMap.get(dto.getOrderStatus()) + "，请及时查看"); bmMessage.setMessageContent("您好，您的订单状态已变更为" + maMachineMap.get(orderInfoDto.getOrderStatus()) + "，请及时查看");
bmMessage.setMessageType(String.valueOf(MessageTypeEnum.ORDER_MESSAGE.getType())); bmMessage.setMessageType(String.valueOf(MessageTypeEnum.ORDER_MESSAGE.getType()));
bmMessage.setUuid(String.valueOf(UUID.randomUUID())); bmMessage.setUuid(String.valueOf(UUID.randomUUID()));
bmMessage.setFromCompany(0L); bmMessage.setFromCompany(0L);
@ -298,16 +298,14 @@ public class OrderServiceImpl implements OrderService {
bmMessage.setFromCompanyName("系统"); bmMessage.setFromCompanyName("系统");
bmMessage.setIsRead(0); bmMessage.setIsRead(0);
// 已下单、已收货、已退租、已完成 通知出租方 // 已下单、已收货、已退租、已完成 通知出租方
if (OrderStatusEnum.TO_ORDER_PLACED.getStatus().equals(dto.getOrderStatus()) || OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().equals(dto.getOrderStatus()) if (OrderStatusEnum.TO_ORDER_PLACED.getStatus().toString().equals(orderInfoDto.getOrderStatus()) || OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString().equals(orderInfoDto.getOrderStatus())
|| OrderStatusEnum.ORDER_UNDER_LEASE.getStatus().equals(dto.getOrderStatus()) || OrderStatusEnum.ORDER_FINISHED.getStatus().equals(dto.getOrderStatus()) || OrderStatusEnum.ORDER_UNDER_LEASE.getStatus().toString().equals(orderInfoDto.getOrderStatus()) || OrderStatusEnum.ORDER_FINISHED.getStatus().toString().equals(orderInfoDto.getOrderStatus())
|| OrderStatusEnum.ORDER_CANCEL.getStatus().equals(dto.getOrderStatus())) { || OrderStatusEnum.ORDER_CANCEL.getStatus().toString().equals(orderInfoDto.getOrderStatus())) {
bmMessage.setToCompanyName(dto.getSellerCompanyName());
//bmMessage.setToUser(Long.parseLong(dto.geuser())); //bmMessage.setToUser(Long.parseLong(dto.geuser()));
bmMessage.setToCompany(Long.valueOf(dto.getSellerCompany())); bmMessage.setToCompany(Long.valueOf(dto.getSellerCompany()));
} else if (OrderStatusEnum.ORDER_RECEIVE.getStatus().equals(dto.getOrderStatus()) || OrderStatusEnum.ORDER_PENDING_SHIPMENT.getStatus().equals(dto.getOrderStatus()) } else if (OrderStatusEnum.ORDER_RECEIVE.getStatus().toString().equals(orderInfoDto.getOrderStatus()) || OrderStatusEnum.ORDER_PENDING_SHIPMENT.getStatus().toString().equals(orderInfoDto.getOrderStatus())
|| OrderStatusEnum.ORDER_REPAIRED.getStatus().equals(dto.getOrderStatus()) || OrderStatusEnum.ORDER_TERMINATED.getStatus().equals(dto.getOrderStatus())) { || OrderStatusEnum.ORDER_REPAIRED.getStatus().toString().equals(orderInfoDto.getOrderStatus()) || OrderStatusEnum.ORDER_TERMINATED.getStatus().toString().equals(orderInfoDto.getOrderStatus())) {
// 已接单、已出库、已检修、已结算 通知承租方 // 已接单、已出库、已检修、已结算 通知承租方
bmMessage.setToCompanyName(dto.getBuyerCompanyName());
//bmMessage.setToUser(Long.parseLong(dto.geuse())); //bmMessage.setToUser(Long.parseLong(dto.geuse()));
bmMessage.setToCompany(Long.valueOf(dto.getBuyerCompany())); bmMessage.setToCompany(Long.valueOf(dto.getBuyerCompany()));
} }