Merge remote-tracking branch 'origin/v29.3_carrier_messsage_20241016' into dev_jdk17

clx-performance-web/src/main/java/com/clx/performance/controller/temp/TempInternalMessageController.java

+package com.clx.performance.controller.temp;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.clx.open.sdk.callback.message.OrderChildSyncMessage;
+import com.clx.performance.dto.OrderChildExpectDTO;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
+import com.clx.performance.extranal.transport.TransportService;
+import com.clx.performance.feign.TransportFeignService;
+import com.clx.performance.listener.OrderChildDtsListener;
+import com.clx.performance.service.OrderChildService;
+import com.clx.performance.service.SendInternalMessageService;
+import com.clx.performance.service.TempService;
+import com.clx.performance.service.child.FeignOrderChildService;
+import com.msl.common.result.Result;
+import com.msl.common.utils.DateUtils;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: aiqingguo
+ * @Description: 临时接口
+ * @Date: 2023-8-21 12:10:16
+ * @Version: 1.0
+ */
+@Slf4j
+@RestController
+@AllArgsConstructor
+@RequestMapping(value="/temp/internalMessage")
+public class TempInternalMessageController {
+
+
+    private final SendInternalMessageService sendInternalMessageService;
+
+
+    @Operation(summary = "发送站内信", description = "<br>By:刘海泉")
+    @RequestMapping(value = "/send", method = RequestMethod.GET)
+    public Result<Object> send(@RequestParam("businessType") @NotBlank(message = "站内信大类业务不能为空") String businessType,
+            @RequestParam("typeCode") @NotNull(message = "业务code不能为空")  Integer  typeCode,
+            @RequestParam("listJson") @NotBlank(message = "参数字符串")  String  listJson
+           ) {
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                businessType, typeCode, JSON.parseObject(listJson, new TypeReference<>() {
+                }),null);
+        return Result.ok();
+
+    }
+
+
+
+
+}

clx-performance-web/src/main/java/com/clx/performance/service/customer/impl/CustomerComplaintDetailServiceImpl.java

@@ -4,9 +4,14 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.customer.CustomerComplaintDetailDao;
+import com.clx.performance.dao.customer.CustomerComplaintTypeDao;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
+import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.model.customer.CustomerComplaintDetail;
+import com.clx.performance.model.customer.CustomerComplaintType;
 import com.clx.performance.param.pc.customer.PageCustomerComplaintDetailParam;
 import com.clx.performance.param.pc.customer.SaveCustomerComplaintDetailParam;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.customer.CustomerComplaintDetailService;
 import com.clx.performance.struct.customer.CustomerComplaintDetailStruct;
 import com.clx.performance.vo.pc.customer.CustomerComplaintDetailVO;
@@ -18,6 +23,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * @ClassName CustomerComplaintTypeServiceImpl
@@ -31,9 +38,13 @@ import java.util.Arrays;
 @AllArgsConstructor
 public class CustomerComplaintDetailServiceImpl implements CustomerComplaintDetailService {
     private final CustomerComplaintDetailDao customerComplaintDetailDao;
-    private final CustomerComplaintDetailStruct customerComplaintDetailStruct;
+    private final CustomerComplaintTypeDao customerComplaintTypeDao;
+    private final SendInternalMessageService sendInternalMessageService;
+
     @Override
     public void saveCustomerComplaintDetail(SaveCustomerComplaintDetailParam param) {
+        CustomerComplaintType type = customerComplaintTypeDao.getEntityByKey(
+                param.getComplaintTypeId()).orElseThrow(ResultEnum.DATA_NOT_FIND, "投诉类型不存在");
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         CustomerComplaintDetail detail = new CustomerComplaintDetail();
         detail.setDriverUserNo(loginUserInfo.getUserNo());
@@ -46,6 +57,12 @@ public class CustomerComplaintDetailServiceImpl implements CustomerComplaintDeta
             detail.setPicture(String.join(",",param.getPicture()));
         }
         customerComplaintDetailDao.saveEntity(detail);
+
+        //客户投诉 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.COMPLAINT_NOTICE.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_SUBMIT_COMPLAINT_CODE, List.of(param.getChildNo(),type.getName(),param.getContent()),null);
+
     }
 
     @Override

clx-performance-web/src/main/java/com/clx/performance/service/impl/SendInternalMessageServiceImpl.java

@@ -192,7 +192,12 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
         //向消息中心发送消息
         log.info("站内信发送参数，发送参数：{}", message);
         Result<Object> result = configuredOpenClient.doAction(new MessageAction(message));
-        log.info("站内信发送成功，发送结果：{}", result.toString());
+        if(result.succeed()){
+            log.info("站内信发送成功，发送结果：{}", result);
+        }else{
+            log.error("站内信发送失败，发送结果：{}", result);
+        }
+
     }
 
 
@@ -209,8 +214,7 @@ public class SendInternalMessageServiceImpl implements SendInternalMessageServic
             return pageDataResult.getData().getRecords().stream().map(
                     PageProductUserVo::getUserNo).collect(Collectors.toList());
         }else{
-
-            log.info("结束查询承运平台下的所有用户信息,响应结果：{}", JSON.toJSONString(pageDataResult));
+            log.error("结束查询承运平台下的所有用户信息,响应结果：{}", JSON.toJSONString(pageDataResult));
             return null;
         }
     }

clx-performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractDriverRecordServiceImpl.java

@@ -7,6 +7,7 @@ import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.breakcontract.BreakContractDriverRecordDao;
 import com.clx.performance.dao.breakcontract.BreakContractDriverRuleDao;
 import com.clx.performance.enums.BreakContractRecordEnum;
+import com.clx.performance.enums.InternalMessageTemplateEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.TruckDemandEnum;
 import com.clx.performance.model.OrderChild;
@@ -17,6 +18,7 @@ import com.clx.performance.param.app.breakcontract.DriverPageBreakContractDriver
 import com.clx.performance.param.pc.breakcontract.carrier.BreakContractDriverRecordAddParam;
 import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractDriverRecordParam;
 import com.clx.performance.service.IntegralRecordService;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.breakcontract.BreakContractDriverRecordService;
 import com.clx.performance.service.breakcontract.BreakContractMqService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
@@ -34,6 +36,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -61,6 +65,8 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
     private UniqueOrderNumService uniqueOrderNumService;
     @Autowired
     private IntegralRecordService integralRecordService;
+    @Autowired
+    SendInternalMessageService sendInternalMessageService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -110,6 +116,12 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
             integralRecordService.addPlatformCompensationRecord(record.getTruckNo());
         }
 
+        //司机违约通知 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null);
+
+
     }
 
     @Override
@@ -171,6 +183,11 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
 
         // 发送mq (违约记录新增)
         breakContractMqService.driverRecordAdd(record.getId());
+
+        //司机违约通知 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null);
     }
 
     @Override
@@ -212,6 +229,12 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
 
         // 发送mq (违约记录新增)
         breakContractMqService.driverRecordAdd(record.getId());
+
+        //司机违约通知 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null);
+
     }
 
     @Override
@@ -250,6 +273,11 @@ public class BreakContractDriverRecordServiceImpl  implements BreakContractDrive
 
         // 发送mq (违约记录新增)
         breakContractMqService.driverRecordAdd(record.getId());
+
+        //司机违约通知 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_DRIVER_TRIGGER_BREAK_CONTRACT_CODE, List.of(record.getBreakNo()),null);
     }
 
     @Override

clx-performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractOwnerRecordServiceImpl.java

@@ -17,6 +17,7 @@ import com.clx.performance.param.pc.breakcontract.carrier.BreakContractOwnerReco
 import com.clx.performance.param.pc.breakcontract.carrier.PageBreakContractOwnerRecordParam;
 import com.clx.performance.param.pc.breakcontract.owner.PageOwnerBreakContractOwnerRecordParam;
 import com.clx.performance.param.pc.owner.OwnerConfirmBreakContractSettlementParam;
+import com.clx.performance.service.SendInternalMessageService;
 import com.clx.performance.service.breakcontract.BreakContractOwnerRecordService;
 import com.clx.performance.service.breakcontract.BreakContractSettlementLogService;
 import com.clx.performance.service.impl.UniqueOrderNumService;
@@ -36,6 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,6 +72,8 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
 
     private final BreakContractSettlementLogService breakContractSettlementLogService;
 
+    private final SendInternalMessageService sendInternalMessageService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveRecord(BreakContractOwnerRecordAddParam param) {
@@ -119,6 +123,11 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
             generateBreakContractSettlement(record.getId());
         }
 
+        //货主违约通知 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null);
+
     }
 
     @Override
@@ -187,6 +196,11 @@ public class BreakContractOwnerRecordServiceImpl  implements BreakContractOwnerR
         //保存违约记录
         breakContractOwnerRecordDao.saveEntity(record);
 
+        //货主违约通知 站内信
+        sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
+                InternalMessageTemplateEnum.BusinessType.WAIT_APPROVED_ITEM.getCode(),
+                InternalMessageTemplateEnum.CUSTOM_OWNER_TRIGGER_BREAK_CONTRACT_CODE, List.of(breakNo),null);
+
     }
 
 

clx-performance-web/src/main/java/com/clx/performance/service/impl/linewarn/LineWarnMqHandlerServiceImpl.java

@@ -221,7 +221,7 @@ public class LineWarnMqHandlerServiceImpl implements LineWarnMqHandlerService {
         //发送站内信mq
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.LINE_WARN.getCode(),
-                vehicleWarnInfo.getWarnType(), Collections.singletonList(vehicleWarnInfo.getOrderGoodsNo()),null);
+                vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getOrderGoodsNo()),null);
 
 
 

clx-performance-web/src/main/java/com/clx/performance/service/impl/vehiclewarn/VehicleWarnMqHandlerServiceImpl.java

@@ -345,7 +345,7 @@ public class VehicleWarnMqHandlerServiceImpl implements VehicleWarnMqHandlerServ
         //发送站内信mq
         sendInternalMessageService.sendInternalMessageMq(InternalMessageTemplateEnum.PlatformType.CARRIER.getCode(),
                 InternalMessageTemplateEnum.BusinessType.CHILD_WARN.getCode(),
-                vehicleWarnInfo.getWarnType(), Collections.singletonList(vehicleWarnInfo.getChildNo()),null);
+                vehicleWarnInfo.getWarnType(), List.of(vehicleWarnInfo.getChildNo()),null);
 
         List<String> mobileList = new ArrayList<>();