Merge remote-tracking branch 'origin/test' into test

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/SettlementOrderChildRiskController.java

@@ -2,6 +2,7 @@ package com.clx.performance.controller.pc.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.carrier.PageSettlementOrderChildRiskParam;
+import com.clx.performance.param.pc.owner.settle.OwnerSettlementOrderChildRiskProcessUpdateParam;
 import com.clx.performance.service.settle.SettlementOrderChildRiskService;
 import com.clx.performance.vo.pc.carrier.settle.SettlementOrderChildRiskVO;
 import com.msl.common.base.PageData;
@@ -32,6 +33,12 @@ public class SettlementOrderChildRiskController {
 
     private final SettlementOrderChildRiskService settlementOrderChildRiskService;
 
+    @ApiOperation(value = "风控处理",notes = "<br>By:李瑞新")
+    @PostMapping("/updateProcessRisk")
+    public Result updateRiskProcess(@RequestBody @Validated OwnerSettlementOrderChildRiskProcessUpdateParam param) {
+        settlementOrderChildRiskService.updateRiskProcess(param);
+        return Result.ok();
+    }
 
     @ApiOperation(value = "风控异常处理列表",notes = "<br>By:杨启发")
     @PostMapping("/pageSettlementOrderChildRisk")

performance-web/src/main/java/com/clx/performance/controller/pc/owner/OwnerSettlementOrderChildRiskController.java

 package com.clx.performance.controller.pc.owner;
 
-import com.clx.performance.param.pc.owner.settle.OwnerSettlementOrderChildRiskProcessUpdateParam;
 import com.clx.performance.service.settle.SettlementOrderChildRiskService;
-import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -23,11 +18,6 @@ public class OwnerSettlementOrderChildRiskController {
 
     private final SettlementOrderChildRiskService settlementOrderChildRiskService;
 
-    @ApiOperation(value = "风控处理",notes = "<br>By:李瑞新")
-    @PostMapping("/updateProcessRisk")
-    public Result updateRiskProcess(@RequestBody @Validated OwnerSettlementOrderChildRiskProcessUpdateParam param) {
-        settlementOrderChildRiskService.updateRiskProcess(param);
-        return Result.ok();
-    }
+
 
 }

performance-web/src/main/java/com/clx/performance/listener/excel/InvoiceDataListener.java

@@ -59,10 +59,10 @@ public class InvoiceDataListener extends AnalysisEventListener<InvoiceData> {
         // 可在此进行表头校验等操作
         //模板有3列，模板第1列是运单编号，第2列是开票标识，第3列是开票金额，校验上传的Excel是否是这个模板
         if (headMap.size() != 3) {
-            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件格式错误");
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件不匹配，请以文件模板为准");
         }
         if (!headMap.get(0).equals("运单编号") || !headMap.get(1).equals("开票标识") || !headMap.get(2).equals("开票金额")) {
-            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件格式错误");
+            throw new ServiceSystemException(DATA_NOT_FIND,"上传文件不匹配，请以文件模板为准");
         }
     }
 }

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

@@ -3240,12 +3240,15 @@ public class OrderChildServiceImpl implements OrderChildService {
             Long driverUserNo = child.getDriverUserNo();
             //获取卡车的位置
             TruckTraceDTO truckTraceDTO = truckTraceMap.get(truckNo);
+            log.info("运单号:{}，卡车:{}，中交兴路地图位置:{}", childNo, truckNo, truckTraceDTO);
             BigDecimal truckLongitudeX = null;
             BigDecimal truckLatitudeY = null;
             if (Objects.nonNull(truckTraceDTO)) {
                 truckLongitudeX = truckTraceDTO.getLocation()[0];
                 truckLatitudeY = truckTraceDTO.getLocation()[1];
-            } else {
+            }
+            if (truckLongitudeX == null || truckLatitudeY == null) {
+                log.info("运单号:{}，卡车:{}，卡车经纬度:{}", childNo, truckNo, truckTraceDTO);
                 BigDecimal[] location = truckTraceService.getCurrentPosition(truckNo, driverUserNo);
                 if (location != null && location.length > 2) {
                     truckLongitudeX = location[0];
@@ -3257,7 +3260,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderGoodsNo).get();
             BigDecimal siteLongitudeX = orderGoods.getSendLongitude();
             BigDecimal siteLatitudeY = orderGoods.getSendLatitude();
-            log.info("运单号：{}，卡车:{}，status:{}，站点经度：{},站点纬度：{},卡车经度：{},卡车纬度：{}", orderGoodsNo, truckNo, child.getStatus(), siteLongitudeX, siteLatitudeY, truckLongitudeX, truckLatitudeY);
+            log.info("运单号：{}，卡车:{}，status:{}，站点经度：{},站点纬度：{},卡车经度：{},卡车纬度：{}", childNo, truckNo, child.getStatus(), siteLongitudeX, siteLatitudeY, truckLongitudeX, truckLatitudeY);
             //调高德获取距离
             if (Objects.nonNull(truckLongitudeX) && Objects.nonNull(truckLatitudeY)) {
                 Integer distance = getGdRoute(truckNo, orderGoods.getSendLongitude(), orderGoods.getSendLatitude(), siteLongitudeX,

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

@@ -372,6 +372,28 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             return;
         }
 
+        // 同步失败
+        if (Objects.equals(result.getSyncStatus(), 2)) {
+
+            // 更新状态
+            settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
+            settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
+
+            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
+            settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
+            settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
+            settlementOrderChildRisk.setDriverMobile(orderChild.getDriverMobile());
+            settlementOrderChildRisk.setGoodsName(orderChild.getGoodsName());
+            settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+            settlementOrderChildRisk.setPoundAuditTime(settlementOwnerDetail.getPoundAuditTime());
+            settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SYNC_FAIL.getCode());
+            settlementOrderChildRisk.setRiskRemark(result.getSyncMsg());
+            settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
+
+            return;
+        }
+
         if (Objects.equals(result.getInvoiceStatus(), 1) ) {
             InvoicingStatusNotifyDTO invoicingStatusNotifyDTO = new InvoicingStatusNotifyDTO();
             invoicingStatusNotifyDTO.setChildNoList(Arrays.asList(mq.getChildNo()));
@@ -416,6 +438,28 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             return;
         }
 
+        // 同步失败
+        if (Objects.equals(result.getSyncStatus(), 2)) {
+
+            // 更新状态
+            settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.FAIL.getCode());
+            settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
+
+            SettlementOrderChildRisk settlementOrderChildRisk = new SettlementOrderChildRisk();
+            settlementOrderChildRisk.setChildNo(orderChild.getChildNo());
+            settlementOrderChildRisk.setTruckNo(orderChild.getTruckNo());
+            settlementOrderChildRisk.setDriverName(orderChild.getDriverName());
+            settlementOrderChildRisk.setDriverMobile(orderChild.getDriverMobile());
+            settlementOrderChildRisk.setGoodsName(orderChild.getGoodsName());
+            settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
+            settlementOrderChildRisk.setPoundAuditTime(settlementOwnerDetail.getPoundAuditTime());
+            settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SYNC_FAIL.getCode());
+            settlementOrderChildRisk.setRiskRemark(result.getSyncMsg());
+            settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
+
+            return;
+        }
+
         if (Objects.equals(result.getSettleStatus(), 1) ) {
 
             if (Objects.equals(orderGoods.getPlatformFreightQuotationTaxType(),QuotationEnum.PlatformFreightQuotationTaxType.NO.getCode())

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

@@ -73,8 +73,6 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
         settlementOrderChildRisk.setProcessBy(loginUserInfo.getUserName());
         settlementOrderChildRisk.setProcessTime(LocalDateTime.now());
 
-        settlementOrderChildRiskDao.updateProcess(settlementOrderChildRisk);
-
         // 转普通单
         if (Objects.equals(param.getProcessMethod(), SettlementOrderChildRiskEnum.ProcessMethod.CONVERT_ORDINARY.getCode())) {
             settlementOwnerDetail.setInvoiceType(SettlementOwnerEnum.InvoiceType.ORDINARY.getCode());
@@ -91,11 +89,14 @@ public class SettlementOrderChildRiskServiceImpl implements SettlementOrderChild
             settlementDriverDetail.setInvoicingCompanyGroupCode(settlementOwnerDetail.getInvoicingCompanyGroupCode());
             settlementDriverDetailDao.updateConvertOrdinary(settlementDriverDetail);
 
+            settlementOrderChildRisk.setInvoiceType(settlementOwnerDetail.getInvoiceType());
         }
         else {
 
         }
 
+        settlementOrderChildRiskDao.updateProcess(settlementOrderChildRisk);
+
         // 发送mq (风控处理)
         settlementMqService.riskProcess(settlementOrderChildRisk.getId());
     }