Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-api/src/main/java/com/clx/performance/vo/mq/SettlementSettleMqParam.java

@@ -19,5 +19,6 @@ public class SettlementSettleMqParam {
 
     private String childNo;             //运单编号
     private Integer InvoiceType;        //开票类型
+    private String remark;              //备注
 
 }

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

@@ -44,6 +44,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
                 .set(SettlementOwnerDetail::getInvoicingCompanyGroupCode, item.getInvoicingCompanyGroupCode())
                 .set(SettlementOwnerDetail::getInvoiceServiceFeeRate, item.getInvoiceServiceFeeRate())
                 .set(SettlementOwnerDetail::getInvoiceServiceFee, item.getInvoiceServiceFee())
+                .set(SettlementOwnerDetail::getRemark, item.getRemark())
         );
     }
 

performance-web/src/main/java/com/clx/performance/listener/OrderChildSyncTransportListener.java

@@ -113,7 +113,7 @@ public class OrderChildSyncTransportListener {
 
         if (Objects.equals(settlementOwnerDetail.getReportFlag(), OrderEnum.ReportFlag.NO.getCode())){
             // 不上报走普通单
-            extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, invoiceType);
+            extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, invoiceType, null);
         }
         else{
 
@@ -146,12 +146,13 @@ public class OrderChildSyncTransportListener {
         if (null != bean  && bean.getCode() == 0 && null != bean.getData() && bean.getData().getStatus() == 1){
             invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
         }
-        extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, invoiceType);
+        extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, invoiceType, remark);
     }
     public void extracted(OrderChild orderChild,
                           SettlementOwnerDetail settlementOwnerDetail,
                           SettlementDriverDetail settlementDriverDetail,
-                          Integer invoiceType) {
+                          Integer invoiceType,
+                          String remark) {
 
         OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).get();
 
@@ -242,6 +243,7 @@ public class OrderChildSyncTransportListener {
             }
         }
         settlementOwnerDetail.setInvoiceType(invoiceType);
+        settlementOwnerDetail.setRemark(remark);
         settlementDriverDetail.setInvoiceType(invoiceType);
 
         // 开票服务费

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -61,6 +61,7 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
     private Integer reportFlag;  //是否上报 0-否;1-是
     private Integer invoiceChannel;                //开票渠道：1无车承运
+    private String remark;                              //备注
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -3,6 +3,7 @@ package com.clx.performance.service.impl.broker;
 import com.clx.order.feign.AddressFeign;
 import com.clx.order.feign.OrderFeign;
 import com.clx.order.vo.feign.FeignAddressVO;
+import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
 import com.clx.performance.dao.OrderChildImageDao;
 import com.clx.performance.enums.PowerTypeEnum;
@@ -59,6 +60,9 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
 
         String host = documentFeign.getHost().getData();
 
+        FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
+        String ownerMobile = ownerFeign.getOwnerInfo(orderInfoFeign.getOwnerUserNo()).getData().getMobile();
+
         FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
         FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
         FeignAddressVO.Address sendAddress = data.getSendAddress();
@@ -80,7 +84,7 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
         TransportParam transportParam = new TransportParam();
         transportParam.setTransportPlatformCode(invoicingCompanyByGroupCode.getNetworkCargoCompanyCode());
         transportParam.setOrderCode(orderChild.getChildNo());
-        transportParam.setOwnerMobile(truckOwnerInfo.getMobile());
+        transportParam.setOwnerMobile(ownerMobile);
 
         // 货单
         OpenOrderDTO orderInfo = new OpenOrderDTO();

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

@@ -220,7 +220,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, mq.getInvoiceType());
+        orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, mq.getInvoiceType(), mq.getRemark());
     }
 
     @Override
@@ -241,24 +241,29 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                 return;
             }
 
-            Integer invoiceType;
+            String remark = "";
+            Integer invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
             if (Objects.equals(result.getRiskStatus(), 1) || Objects.equals(result.getRiskStatus(), 2)) {
                 invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
-            } else if (Objects.equals(result.getSyncStatus(), 2)) {
+                remark += result.getRiskReason();
+            }
+
+            if (Objects.equals(result.getSyncStatus(), 2)) {
                 invoiceType = SettlementOwnerEnum.InvoiceType.ORDINARY.getCode();
-            } else if (Objects.equals(result.getSyncStatus(), 0)) {
+                remark += result.getSyncMsg();
+            }
+
+            if (Objects.equals(result.getSyncStatus(), 0)) {
                 OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
                 entity.setChildNo(orderChild.getChildNo());
                 entity.setType(TransportSyncTypeEnum.Type.EXCEPTION.getCode());
                 entity.setRemark("处理中");
                 orderChildSyncTransportInvoiceRecordDao.saveEntity(entity);
                 return;
-            } else {
-                invoiceType = SettlementOwnerEnum.InvoiceType.ONLINE.getCode();
             }
 
             // 发送mq （结算）
-            settlementMqService.settle(orderChild.getChildNo(), invoiceType);
+            settlementMqService.settle(orderChild.getChildNo(), invoiceType, remark);
         }catch (Exception e){
             OrderChildSyncTransportInvoiceRecord entity = new OrderChildSyncTransportInvoiceRecord();
             entity.setChildNo(orderChild.getChildNo());

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

@@ -68,11 +68,12 @@ public class SettlementMqServiceImpl implements SettlementMqService {
     }
 
     @Override
-    public void settle(String childNo, Integer invoiceType) {
+    public void settle(String childNo, Integer invoiceType, String remark) {
 
         SettlementSettleMqParam mq = new SettlementSettleMqParam();
         mq.setChildNo(childNo);
         mq.setInvoiceType(invoiceType);
+        mq.setRemark(remark);
         MqDelay<MqWrapper<SettlementSettleMqParam>> delay = new MqDelay<>(RabbitKeySettlementConstants.DEFAULT_EXCHANGE,
                 RabbitKeySettlementConstants.SETTLEMENT_SETTLE_ROUTING_KEY, new MqWrapper<>(mq));
         Message message = MessageBuilder.withBody(JSON.toJSONString(new MqWrapper<>(delay)).getBytes()).build();

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

@@ -8,7 +8,7 @@ public interface SettlementMqService {
 
     void invoiceTypeSync(String childNo);
 
-    void settle(String childNo, Integer invoiceType);
+    void settle(String childNo, Integer invoiceType, String remark);
 
     void invoiceStatusSync(String childNo);