|
|
@@ -44,6 +44,7 @@ import jakarta.validation.Valid;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.cloud.stream.function.StreamBridge;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -95,6 +96,10 @@ public class KwtWaybillOrderService {
|
|
|
private RemoteFleetService remoteFleetService;
|
|
|
@DubboReference(version = "1.0.0", group = "design", check = false)
|
|
|
private TradeOrderInfoService tradeOrderInfoService;
|
|
|
+ @Value("${message.waybill.refuseSendCar.app}")
|
|
|
+ private String refuseSendCarAppUrl;
|
|
|
+ @Value("${message.waybill.refuseSendCar.pc}")
|
|
|
+ private String refuseSendCarPcUrl;
|
|
|
|
|
|
/**
|
|
|
* @param driverId 司机ID
|
|
|
@@ -1365,7 +1370,10 @@ public class KwtWaybillOrderService {
|
|
|
msg.setRequestId(UUIDUtils.get32UUID());
|
|
|
msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_TRIP);
|
|
|
msg.setParams(msgParams);
|
|
|
- msg.setMsgUrl(null);
|
|
|
+ msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
+ put("app", refuseSendCarAppUrl);
|
|
|
+ put("pc", refuseSendCarPcUrl);
|
|
|
+ }});
|
|
|
msg.setUserInfos(users);
|
|
|
msg.setCreateBy(LoginUserHolder.getUserId());
|
|
|
streamBridge.send("sckw-message", JSON.toJSONString(msg));
|
|
|
@@ -1408,7 +1416,10 @@ public class KwtWaybillOrderService {
|
|
|
msg.setRequestId(UUIDUtils.get32UUID());
|
|
|
msg.setMessageEnum(MessageEnum.WAYBILL_REFUSE_SENDCAR_CIRCULATE);
|
|
|
msg.setParams(msgParams);
|
|
|
- msg.setMsgUrl(null);
|
|
|
+ msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
+ put("app", refuseSendCarAppUrl);
|
|
|
+ put("pc", refuseSendCarPcUrl);
|
|
|
+ }});
|
|
|
msg.setUserInfos(users);
|
|
|
msg.setCreateBy(LoginUserHolder.getUserId());
|
|
|
streamBridge.send("sckw-message", JSON.toJSONString(msg));
|
|
|
@@ -1531,7 +1542,10 @@ public class KwtWaybillOrderService {
|
|
|
msg.setRequestId(UUIDUtils.get32UUID());
|
|
|
msg.setMessageEnum(MessageEnum.WAYBIL_CONFIRM_DEPARTURE);
|
|
|
msg.setParams(msgParams);
|
|
|
- msg.setMsgUrl(null);
|
|
|
+ msg.setMsgUrls(new HashMap<>(Global.NUMERICAL_SIXTEEN) {{
|
|
|
+ put("app", refuseSendCarAppUrl);
|
|
|
+ put("pc", refuseSendCarPcUrl);
|
|
|
+ }});
|
|
|
msg.setUserInfos(users);
|
|
|
msg.setCreateBy(LoginUserHolder.getUserId());
|
|
|
streamBridge.send("sckw-message", JSON.toJSONString(msg));
|