消息

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -584,9 +584,9 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     @Override
     public com.gic.api.base.commons.ServiceResponse<Void> sendOrderMessage(String enterpriseId,
-            NoticeMessageTypeEnum noticeType, String relationId,  String refundStoreId ,String clerkId, String memberId,
+            NoticeMessageTypeEnum noticeType, String relationId, String refundStoreId, String clerkId, String memberId,
             List<String> valueList) {
-        log.info("订单消息通知={},{},{}", memberId, clerkId, relationId);
+        log.info("订单消息通知={},{},{},refundStoreId={}", memberId, clerkId, relationId, refundStoreId);
         List<NoticeMessageQDTO> list = new ArrayList<>();
         if (StringUtils.isAnyBlank(enterpriseId, clerkId, memberId)) {
             return com.gic.api.base.commons.ServiceResponse.failure("9999", "必传参数没传");
@@ -599,6 +599,14 @@ public class MessageApiServiceImpl implements MessageApiService {
         if (null == clerkDTO) {
             return com.gic.api.base.commons.ServiceResponse.failure("9999", "导购查不到");
         }
+        String storeId = clerkDTO.getStoreId();
+        // 如果是退款收货
+        if (StringUtils.isNotEmpty(refundStoreId) && !refundStoreId.equals(clerkDTO.getStoreId())) {
+            log.info("收货门店不是归属门店,store={},{}", refundStoreId, clerkDTO.getStoreId());
+            storeId = refundStoreId;
+            ClerkDTO dz = this.clerkService.getClerkLeaderByStoreId(storeId);
+            clerkId = dz.getClerkId();
+        }
         Map<String, Object> extendContent = new HashMap<>();
         if (messageTypeEnum.equals(NoticeMessageTypeEnum.ORDER_PAY)) {
             extendContent.put("currentTab ", 0);
@@ -608,7 +616,6 @@ public class MessageApiServiceImpl implements MessageApiService {
         Map<String, String> map = this.toMapValue(memberId, valueList);
         NoticeMessageQDTO qdto = this.getDTO(enterpriseId, clerkId, relationId, noticeType, map, extendContent);
         list.add(qdto);
-        String storeId = clerkDTO.getStoreId();
         ClerkDTO dz = this.clerkService.getClerkLeaderByStoreId(storeId);
         if (null != dz && !dz.getClerkId().equals(clerkId)) {
             NoticeMessageQDTO dzQdto = this.getDTO(enterpriseId, dz.getClerkId(), relationId, noticeType, map,