修改运单,结算单，结算单明细的开票公司信息

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java

@@ -54,4 +54,11 @@ public class CarrierPageSettlementOwnerVO {
     private Integer status;
     @ApiModelProperty("结算方式  1装车净重 2卸车净重")
     private Integer settlementWay;
+    @ApiModelProperty("开票公司简称")
+    private String invoicingCompanyShorterName;
+    @ApiModelProperty("开票公司统一社会信用代码")
+    private String invoicingCompanyGroupCode;
+    @ApiModelProperty("是否上报 0-否;1-是")
+    private Integer reportFlag;
+
 }

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerDetailVO.java

@@ -153,5 +153,12 @@ public class CarrierSettlementOwnerDetailVO {
     @ApiModelProperty(value = "结算单操作日志")
     private List<SettlementLogVO> settlementLogs;
 
+    @ApiModelProperty("开票公司简称")
+    private String invoicingCompanyShorterName;
+    @ApiModelProperty("开票公司统一社会信用代码")
+    private String invoicingCompanyGroupCode;
+    @ApiModelProperty("是否上报 0-否;1-是")
+    private Integer reportFlag;
+
 
 }
\ No newline at end of file

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

 package com.clx.performance.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.msl.common.config.KeyColumn;
@@ -92,7 +93,12 @@ public class OrderChild implements HasKey<Integer> {
 
     private Integer settlementAccountPeriod;                 //结算账期  1拉运完成结  2月结
 
-    private Integer settlementWay;                          //结算方式  1装车净重 2卸车净重
+    private Integer settlementWay;                          //结算方式  1装车净重
+    private Integer invoicingCompanyId;  //开票公司id
+    private String invoicingCompanyShorterName; //开票公司简称
+    private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
+    private Integer reportFlag;  //是否上报 0-否;1-是
+
 
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -68,6 +68,10 @@ public class SettlementOwner implements HasKey<Integer> {
     private Integer mergeStatus;                         //是否合并 0-否，1-是
     private Integer mergeSettlementFlag;            //合并结算单标志 1:普通结算单  2:合并结算单
     private String mergedBy;                         //合并人
+    private Integer invoicingCompanyId;  //开票公司id
+    private String invoicingCompanyShorterName; //开票公司简称
+    private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
+    private Integer reportFlag;  //是否上报 0-否;1-是
     private LocalDateTime mergeTime;                       //合并结算单时间
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -53,6 +53,10 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private Integer invoiceType;                    //开票标识：1网运单 2普通单
     private Integer finalPaymentStatus;             //尾款状态 0-否,1-是,2-无需支付
     private Integer invoiceStatus;                  //开票状态 0-否,1-是,2-无需开票
+    private Integer invoicingCompanyId;  //开票公司id
+    private String invoicingCompanyShorterName; //开票公司简称
+    private String invoicingCompanyGroupCode;  //开票公司统一社会信用代码
+    private Integer reportFlag;  //是否上报 0-否;1-是
     private Integer status;                         //状态
     private LocalDateTime createTime;                      //创建时间
     private LocalDateTime modifiedTime;                    //修改时间

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

@@ -382,6 +382,12 @@ public class OrderChildServiceImpl implements OrderChildService {
         orderChild.setSettlementAccountPeriod(orderGoods.getSettlementAccountPeriod());
         orderChild.setSettlementWay(orderGoods.getSettlementWay());
 
+        //设置开票公司信息
+        orderChild.setInvoicingCompanyId(orderInfo.getInvoicingCompanyId());
+        orderChild.setInvoicingCompanyShorterName(orderInfo.getInvoicingCompanyShorterName());
+        orderChild.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
+        orderChild.setReportFlag(orderInfo.getReportFlag());
+
         // 更新货单数据
         updateOrderGoodsAmount(orderGoods, orderChild);
 

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

 package com.clx.performance.service.impl.settle;
 
+import com.clx.order.vo.feign.FeignOrderInfoVO;
 import com.clx.performance.config.MslPaymentConfig;
 import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.OrderChildDao;
@@ -17,6 +18,7 @@ import com.clx.performance.enums.settle.SettlementLogEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementPlatformEnum;
 import com.clx.performance.extranal.user.DriverService;
+import com.clx.performance.extranal.user.OrderService;
 import com.clx.performance.extranal.user.OwnerInfoService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
@@ -103,6 +105,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private OrderChildSyncTransportRecordService childSyncTransportRecordService;
 
+    @Autowired
+    private OrderService orderService;
+
+
 
 
 
@@ -293,6 +299,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     private String settlementPeriodMonthInit(SettlementOwnerDetail settlementOwnerDetail, LocalDateTime settlementPeriodTime,OwnerInfoFeignVO ownerInfo){
 
 
+        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
+
         //获取所有detail
 
         SettlementOwner settlementOwner = new SettlementOwner();
@@ -331,6 +339,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setCompanyContactMobile(ownerInfo.getContactsTelephone());
         settlementOwner.setCompanyContactAddress(ownerInfo.getContactsAddress());
         settlementOwner.setSettlementWay(settlementOwnerDetail.getSettlementWay());
+        //设置开票公司
+        settlementOwner.setInvoicingCompanyId(orderInfo.getInvoicingCompanyId());
+        settlementOwner.setInvoicingCompanyShorterName(orderInfo.getInvoicingCompanyShorterName());
+        settlementOwner.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
+        settlementOwner.setReportFlag(orderInfo.getReportFlag());
         settlementOwnerDao.saveEntity(settlementOwner);
 
         //保存结算单日志----创建结算单
@@ -373,6 +386,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
      * 拉运完成结 初始化
      */
     private String settlementPeriodImmediateInit(SettlementOwnerDetail settlementOwnerDetail,OwnerInfoFeignVO ownerInfo){
+
+        FeignOrderInfoVO orderInfo = orderService.getOrderInfo(settlementOwnerDetail.getOrderNo()).orElseThrow(PerformanceResultEnum.ORDER_INVALID);
+
         SettlementOwner settlementOwner = new SettlementOwner();
 
         String settlementNo = settlementNoGenerate();
@@ -409,6 +425,11 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         settlementOwner.setSettlementWay(settlementOwnerDetail.getSettlementWay());
         settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.NOT_INVOICE.getCode());
 
+        //设置开票公司
+        settlementOwner.setInvoicingCompanyId(orderInfo.getInvoicingCompanyId());
+        settlementOwner.setInvoicingCompanyShorterName(orderInfo.getInvoicingCompanyShorterName());
+        settlementOwner.setInvoicingCompanyGroupCode(orderInfo.getInvoicingCompanyGroupCode());
+        settlementOwner.setReportFlag(orderInfo.getReportFlag());
         settlementOwnerDao.saveEntity(settlementOwner);
 
         //保存结算单日志----创建结算单

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

@@ -144,8 +144,12 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 //
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
+        //设置开票公司信息
+        settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
+        settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
+        settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
+        settlementOwnerDetail.setReportFlag(orderChild.getReportFlag());
         settlementOwnerDetailDao.saveEntity(settlementOwnerDetail);
-
         return settlementOwnerDetail.getId();
     }