增加数媒宝和马上来供应链sdk对接的接口逻辑

clx-performance-web/src/main/java/com/clx/performance/controller/OrderChildExceptionReportController.java

+package com.clx.performance.controller;
+
+import com.clx.performance.param.pc.DealExceptionReportParam;
+import com.clx.performance.service.OrderChildExceptionReportService;
+import com.msl.common.result.Result;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/pc/carrier/exceptionReport")
+@Validated
+@Tag(name = "承运端-异常上报")
+@AllArgsConstructor
+public class OrderChildExceptionReportController {
+
+    private final OrderChildExceptionReportService orderChildExceptionReportService;
+
+    @Deprecated
+    @Operation(summary = "异常上报处理", description = "<br>By:刘海泉")
+    public Result<?> updateDealExceptionReport(@RequestBody @Validated DealExceptionReportParam param) {
+        orderChildExceptionReportService.updateDealExceptionReport(param);
+        return Result.ok();
+    }
+
+
+}

clx-performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java

 package com.clx.performance.controller.feign;
 
+import com.alibaba.fastjson.JSON;
 import com.clx.open.sdk.request.action.*;
 import com.clx.open.sdk.request.dto.BatchOrderStatisticsDTO;
 import com.clx.open.sdk.request.dto.BatchOrderStatisticsInfoDTO;
@@ -146,17 +147,22 @@ public class PerformanceSdkFeignController {
     //数媒宝同步异常上报信息
     @PostMapping("clx-performance/feign/sdk/smbSyncExceptionReportInfo")
     Result<String> smbSyncExceptionReportInfo(@RequestBody @Validated SmbSyncExceptionReportInfoAction action){
-        return orderChildExceptionReportService.smbSyncExceptionReportInfo(action);
+        log.info("数媒宝同步异常上报信息开始，请求参数：{}", JSON.toJSONString(action));
+        Result<String> result = orderChildExceptionReportService.smbSyncExceptionReportInfo(action);
+        log.info("数媒宝同步异常上报信息结束，响应结果：{}", result);
+        return result;
     }
     //数媒宝同步异常上报结果
     @PostMapping("clx-performance/feign/sdk/smbSyncExceptionReportResult")
     Result<Object> smbSyncExceptionReportResult(@RequestBody @Validated SmbSyncExceptionReportResultAction action){
+        log.info("数媒宝同步异常上报结果开始，请求参数：{}", JSON.toJSONString(action));
         return orderChildExceptionReportService.smbSyncExceptionReportResult(action);
     }
 
     //数媒宝撤销异常上报
     @PostMapping("clx-performance/feign/sdk/smbWithdrawExceptionReport")
     Result<Object> smbWithdrawExceptionReport(@RequestBody @Validated SmbWithdrawExceptionReportAction action){
+        log.info("数媒宝撤销异常上报开始，请求参数：{}", JSON.toJSONString(action));
         return orderChildExceptionReportService.smbWithdrawExceptionReport(action);
     }
 
@@ -165,18 +171,24 @@ public class PerformanceSdkFeignController {
     //马上来供应链同步异常上报信息
     @PostMapping("clx-performance/feign/sdk/mslSyncExceptionReportInfo")
     Result<String> mslSyncExceptionReportInfo(@RequestBody @Validated MslSyncExceptionReportInfoAction action){
-        return orderChildExceptionReportService.mslSyncExceptionReportInfo(action);
+        log.info("马上来供应链同步异常上报信息开始，请求参数：{}", JSON.toJSONString(action));
+        Result<String> result =  orderChildExceptionReportService.mslSyncExceptionReportInfo(action);
+        log.info("马上来供应链同步异常上报信息结束，响应结果：{}", result);
+        return result;
+
     }
 
     //马上来供应链同步异常上报结果
     @PostMapping("clx-performance/feign/sdk/mslSyncExceptionReportResult")
     Result<Object> mslSyncExceptionReportResult(@RequestBody @Validated MslSyncExceptionReportResultAction action){
+        log.info("马上来供应链同步异常上报结果开始，请求参数：{}", JSON.toJSONString(action));
         return orderChildExceptionReportService.mslSyncExceptionReportResult(action);
     }
 
     //马上来供应链撤销异常上报
     @PostMapping("clx-performance/feign/sdk/mslWithdrawExceptionReport")
     Result<Object> mslWithdrawExceptionReport(@RequestBody @Validated MslWithdrawExceptionReportAction action){
+        log.info("马上来供应链撤销异常上报开始，请求参数：{}", JSON.toJSONString(action));
         return orderChildExceptionReportService.mslWithdrawExceptionReport(action);
     }
 

clx-performance-web/src/main/java/com/clx/performance/dao/OrderChildExceptionReportDao.java

@@ -10,4 +10,5 @@ import com.clx.performance.model.OrderChildExceptionReport;
  * Time 10:38
  */
 public interface OrderChildExceptionReportDao extends BaseDao<OrderChildExceptionReportMapper, OrderChildExceptionReport, Integer> {
+    OrderChildExceptionReport findByThirdReportNoAndSource(Integer source, String thirdReportNo);
 }

clx-performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildExceptionReportDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import com.clx.performance.dao.OrderChildExceptionReportDao;
 import com.clx.performance.mapper.OrderChildExceptionReportMapper;
@@ -13,4 +14,11 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public class OrderChildExceptionReportDaoImpl extends BaseDaoImpl<OrderChildExceptionReportMapper, OrderChildExceptionReport, Integer> implements OrderChildExceptionReportDao {
+    @Override
+    public OrderChildExceptionReport findByThirdReportNoAndSource(Integer source, String thirdReportNo) {
+        LambdaQueryWrapper<OrderChildExceptionReport> query = new LambdaQueryWrapper<>();
+        query.eq(OrderChildExceptionReport :: getSource,source);
+        query.eq(OrderChildExceptionReport ::getThirdReportNo,thirdReportNo);
+        return baseMapper.selectOne(query);
+    }
 }

clx-performance-web/src/main/java/com/clx/performance/model/OrderChildExceptionReport.java

@@ -78,7 +78,7 @@ public class OrderChildExceptionReport implements HasKey<Integer> {
 
     @TableField("deal_time")
     @Schema(description="处理时间")
-    private String dealTime;
+    private LocalDateTime dealTime;
 
     @TableField("deal_result")
     @Schema(description="处理结果")

clx-performance-web/src/main/java/com/clx/performance/service/OrderChildExceptionReportService.java

 package com.clx.performance.service;
 
 import com.clx.open.sdk.request.action.*;
+import com.clx.performance.param.pc.DealExceptionReportParam;
 import com.msl.common.result.Result;
 
 /**
@@ -20,4 +21,6 @@ public interface OrderChildExceptionReportService {
     Result<Object> mslSyncExceptionReportResult(MslSyncExceptionReportResultAction action);
 
     Result<Object> mslWithdrawExceptionReport(MslWithdrawExceptionReportAction action);
+
+    void updateDealExceptionReport(DealExceptionReportParam param);
 }

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

 package com.clx.performance.service.impl;
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.clx.open.sdk.callback.OpenCallBackClient;
+import com.clx.open.sdk.callback.message.MslExceptionReportDealMessage;
+import com.clx.open.sdk.callback.message.SmbExceptionReportDealMessage;
+import com.clx.open.sdk.enums.ExceptionReportEnum;
 import com.clx.open.sdk.request.action.*;
+import com.clx.performance.config.ThirdAppConfig;
 import com.clx.performance.constant.RedisConstants;
 import com.clx.performance.dao.OrderChildExceptionReportDao;
-import com.clx.performance.enums.ExceptionReportEnum;
+import com.clx.performance.dao.OrderChildExceptionReportDealLogDao;
+import com.clx.performance.enums.CarrierExceptionReportEnum;
+import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.enums.SyncPlatformEnum;
 import com.clx.performance.model.OrderChildExceptionReport;
+import com.clx.performance.model.OrderChildExceptionReportDealLog;
+import com.clx.performance.param.pc.DealExceptionReportParam;
 import com.clx.performance.service.OrderChildExceptionReportService;
 import com.clx.performance.struct.OrderChildExceptionReportStruct;
 import com.clx.performance.utils.LocalDateTimeUtils;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import com.msl.common.utils.DateUtils;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -33,7 +49,9 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
 
     private final OrderChildExceptionReportStruct orderChildExceptionReportStruct;
     private final OrderChildExceptionReportDao orderChildExceptionReportDao;
+    private final OrderChildExceptionReportDealLogDao orderChildExceptionReportDealLogDao;
     private final RedisTemplate<String,Integer> redisTemplate;
+    private final ThirdAppConfig thirdAppConfig;
 
     @Override
     public Result<String> smbSyncExceptionReportInfo(SmbSyncExceptionReportInfoAction action) {
@@ -43,12 +61,15 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
 
     @Override
     public Result<Object> smbSyncExceptionReportResult(SmbSyncExceptionReportResultAction action) {
-        return null;
+        updateExceptionReportResult(SyncPlatformEnum.Source.TRADE_PLATFORM.getCode(),
+                action.getThirdReportNo(),action.getBreakContractParty());
+        return Result.ok();
     }
 
     @Override
     public Result<Object> smbWithdrawExceptionReport(SmbWithdrawExceptionReportAction action) {
-        return null;
+        withdrawExceptionReport(SyncPlatformEnum.Source.TRADE_PLATFORM.getCode(), action.getThirdReportNo());
+        return Result.ok();
     }
 
     @Override
@@ -59,19 +80,55 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
 
     @Override
     public Result<Object> mslSyncExceptionReportResult(MslSyncExceptionReportResultAction action) {
-        return null;
+        updateExceptionReportResult(SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode(),
+                action.getThirdReportNo(),action.getBreakContractParty());
+        return Result.ok();
     }
 
     @Override
     public Result<Object> mslWithdrawExceptionReport(MslWithdrawExceptionReportAction action) {
-        return null;
+        withdrawExceptionReport(SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode(), action.getThirdReportNo());
+        return Result.ok();
     }
 
+    public void updateExceptionReportResult(Integer source,String thirdReportNo,Integer breakContractParty){
+        OrderChildExceptionReport report = orderChildExceptionReportDao.findByThirdReportNoAndSource(source,thirdReportNo);
+        if(Objects.isNull(report)){
+            log.warn("通过第三方上报编号：{} 未找到对应数据",thirdReportNo);
+            throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
+        }
+        if(Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.PROCESSED.getCode())
+                || Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.WITHDRAWN.getCode())){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"异常数据已被处理或撤回");
+        }
+        report.setDealTime(LocalDateTime.now());
+        report.setDealUser(SyncPlatformEnum.Source.getNameByCode(source));
+        report.setStatus(CarrierExceptionReportEnum.Status.PROCESSED.getCode());
+        report.setDealResult(ExceptionReportEnum.DealResult.getNameByCode(breakContractParty));
+        orderChildExceptionReportDao.updateEntityByKey(report);
+    }
+
+    public void withdrawExceptionReport(Integer source,String thirdReportNo){
+        OrderChildExceptionReport report = orderChildExceptionReportDao.findByThirdReportNoAndSource(source,thirdReportNo);
+        if(Objects.isNull(report)){
+            log.warn("通过第三方上报编号：{} 未找到对应数据",thirdReportNo);
+            throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
+        }
+        if(!Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.WAIT_DEAL.getCode())){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"非待处理数据无法撤回");
+        }
+        report.setDealTime(LocalDateTime.now());
+        report.setDealUser(SyncPlatformEnum.Source.getNameByCode(source));
+        report.setStatus(CarrierExceptionReportEnum.Status.WITHDRAWN.getCode());
+        orderChildExceptionReportDao.updateEntityByKey(report);
+    }
+
+
 
     private String saveExceptionReportInfo(OrderChildExceptionReport report,Integer source){
         report.setReportNo(getReportNo());
         report.setSource(source);
-        report.setStatus(ExceptionReportEnum.Status.WAIT_DEAL.getCode());
+        report.setStatus(CarrierExceptionReportEnum.Status.WAIT_DEAL.getCode());
         orderChildExceptionReportDao.saveEntity(report);
         return report.getReportNo();
     }
@@ -112,15 +169,75 @@ public class OrderChildExceptionReportServiceImpl  implements OrderChildExceptio
         return RedisConstants.EXCEPTION_REPORT_CACHE_KEY + datetime;
     }
 
-    public static void main(String[] args) {
-        LocalDateTime begin = LocalDateTime.now();
+    @Override
+    public void updateDealExceptionReport(DealExceptionReportParam param) {
+        OrderChildExceptionReport report = orderChildExceptionReportDao.getEntityByKey(param.getId()).orElseThrow(
+                ResultEnum.DATA_NOT_FIND);
 
-        LocalDateTime end = LocalDateTimeUtils.getDayEnd(begin);
+        OrderChildExceptionReportDealLog dealLog =  null;
 
-        long seconds = LocalDateTimeUtils.betweenSecond(begin, end);
+        if(Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.PROCESSED.getCode())
+                || Objects.equals(report.getStatus(), CarrierExceptionReportEnum.Status.WITHDRAWN.getCode())){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"异常数据已被处理或撤回");
+        }
+        if(Objects.equals(param.getDealWay(),ExceptionReportEnum.DealWay.APPEAL.getCode())  && StringUtils.isBlank(param.getAppealReason())){
+            throw new ServiceSystemException(ResultEnum.PARAM_ERROR,"申诉原因不能为空");
+        }
+
+        if(Objects.equals(param.getDealWay(),ExceptionReportEnum.DealWay.APPEAL.getCode())){
+            report.setStatus(CarrierExceptionReportEnum.Status.APPEAL_IN_PROGRESS.getCode());
+            dealLog = new OrderChildExceptionReportDealLog();
+            dealLog.setReportNo(report.getReportNo());
+            dealLog.setDealWay(param.getDealWay());
+            dealLog.setAppealReason(param.getAppealReason());
+            dealLog.setPictureUrl(JSON.toJSONString(param.getPictureUrl()));
+            dealLog.setVideoUrl(JSON.toJSONString(param.getVideoUrl()));
+
+        }else{
+            UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+            report.setStatus(CarrierExceptionReportEnum.Status.PROCESSED.getCode());
+            report.setDealTime(LocalDateTime.now());
+            report.setDealResult(ExceptionReportEnum.DealResult.CARRIER_BREAK_CONTRACT.getName());
+            report.setDealUserCode(loginUserInfo.getUserNo());
+            report.setDealUser(loginUserInfo.getUserName());
+
+        }
 
-        System.out.println(seconds);
+        //同步给第三方
+        if(Objects.equals(report.getSource(),SyncPlatformEnum.Source.TRADE_PLATFORM.getCode())){
+            SmbExceptionReportDealMessage message = new SmbExceptionReportDealMessage();
+            message.setThirdReportNo(report.getThirdReportNo());
+            message.setDealWay(param.getDealWay());
+            message.setAppealReason(param.getAppealReason());
+            message.setPictureUrl(param.getPictureUrl());
+            message.setVideoUrl(param.getVideoUrl());
+            String data = JSONUtil.parse(message).toString();
+            log.info("开始通知：{} 上报异常处理，请求参数：{}",SyncPlatformEnum.Source.TRADE_PLATFORM.getName(),data);
+            OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(report.getSource().toString());
+            Result<?> result = openCallBackClient.encryptPost(JSONUtil.parse(message).toString(),message.topic());
+            log.info("结束通知：{} 上报异常处理，请求参数：{}",SyncPlatformEnum.Source.TRADE_PLATFORM.getName(),result);
 
+        }
+
+        if(Objects.equals(report.getSource(),SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getCode())){
+            MslExceptionReportDealMessage message = new MslExceptionReportDealMessage();
+            message.setThirdReportNo(report.getThirdReportNo());
+            message.setDealWay(param.getDealWay());
+            message.setAppealReason(param.getAppealReason());
+            message.setPictureUrl(param.getPictureUrl());
+            message.setVideoUrl(param.getVideoUrl());
+            String data = JSONUtil.parse(message).toString();
+            log.info("开始通知：{} 上报异常处理，请求参数：{}",SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getName(),data);
+            OpenCallBackClient openCallBackClient = thirdAppConfig.getOpenCallBackClient(report.getSource().toString());
+            Result<?> result = openCallBackClient.encryptPost(data,message.topic());
+            log.info("结束通知：{} 上报异常处理，请求参数：{}",SyncPlatformEnum.Source.NEW_OWNER_CLIENT.getName(),result);
+
+        }
+
+        orderChildExceptionReportDao.updateEntityByKey(report);
+        if(Objects.nonNull(dealLog)){
+            orderChildExceptionReportDealLogDao.saveEntity(dealLog);
+        }
 
     }
 }

performance-api/src/main/java/com/clx/performance/enums/ExceptionReportEnum.java → performance-api/src/main/java/com/clx/performance/enums/CarrierExceptionReportEnum.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-public enum ExceptionReportEnum {
+public enum CarrierExceptionReportEnum {
     ;
 
     @Getter

performance-api/src/main/java/com/clx/performance/param/pc/DealExceptionReportParam.java

+package com.clx.performance.param.pc;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @ClassName DealExceptionReportParam
+ * @Description
+ * @Author kavin
+ * @Date 2024/10/22 20:07
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+public class DealExceptionReportParam {
+
+    @NotNull(message = "异常上报ID不能为空")
+    @Schema(description="异常上报ID")
+    private Integer id;
+
+
+    @NotNull(message = "处理方式不能为空")
+    @Schema(description="处理方式  1:同意扣罚  2：申诉" ,example = "枚举 ExceptionReportEnum.DealWay ")
+    private Integer dealWay;
+
+
+    @Schema(description="申诉原因")
+    private String appealReason;
+
+
+    @Schema(description="图片")
+    private List<String> pictureUrl;
+
+
+    @Schema(description="视频")
+    private List<String> videoUrl;
+}