Skip to content

C
clx-performance
提交 908823f0 authored 作者: 艾庆国's avatar 艾庆国
浏览文件
操作

Merge branch 'refs/heads/v30.6_order_quote_20241022' into dev_jdk17

上级 926336c9 20422833
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 125 行增加 和 61 行删除
clx-performance-web/src/main/java/com/clx/performance/model/OrderChild.java
浏览文件 @ 908823f0
......@@ -39,6 +39,7 @@ public class OrderChild implements HasKey<Integer> {
private Integer goodsId; //货物id
private String goodsName; //货物名称
private BigDecimal freightPrice; //运费单价（分）
private BigDecimal forecastFreightPrice; //预估运费单价（分）
private BigDecimal lossPrice; //损耗单价(分)
private BigDecimal orderFreightPrice; //订单运费单价（分）
......
clx-performance-web/src/main/java/com/clx/performance/model/OrderGoods.java
浏览文件 @ 908823f0
......@@ -169,6 +169,8 @@ public class OrderGoods implements HasKey<Integer> {
@Schema(description="挂单运费")
private BigDecimal pendingOrderFreight;
private BigDecimal forecastOrderFreight; //预估运费单价（分）
@TableField("user_no")
@Schema(description="创建人用户编号")
private Long userNo;
......
clx-performance-web/src/main/java/com/clx/performance/model/settle/SettlementOrderChildRisk.java
浏览文件 @ 908823f0
......@@ -25,7 +25,7 @@ public class SettlementOrderChildRisk implements HasKey<Integer> {
private String driverMobile; // 司机手机号
private String goodsName; // 货物名称
private Integer invoiceType; // 开票标识：1网运单 2普通单
private Integer invoiceConfigType; // 开票配置：0否 2是
private Integer invoiceConfigType; // 开票配置：0否 1是
private LocalDateTime poundAuditTime; // 磅单审核通过时间
private Integer riskType; // 风控标识：1同步失败 2结算打回
private String riskRemark; // 风控失败原因
......
clx-performance-web/src/main/java/com/clx/performance/service/broker/OrderChildBrokerService.java
浏览文件 @ 908823f0
package com.clx.performance.service.broker;
import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
import com.clx.performance.model.OrderChild;
import com.clx.performance.model.OrderGoods;
import com.clx.performance.model.settle.SettlementDriver;
......@@ -10,10 +9,9 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
public interface OrderChildBrokerService {
void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
SettlementDriverDetail settlementDriverDetail, OwnerQuotationDetailVO quotationDetailVO);
SettlementDriverDetail settlementDriverDetail);
void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
OwnerQuotationDetailVO quotationDetailVO);
SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver);
void orderChildDriverPay(SettlementDriverDetail settlementDriverDetail);
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @ 908823f0
......@@ -498,6 +498,7 @@ public class OrderChildServiceImpl implements OrderChildService {
orderChild.setOrderNo(orderGoods.getOrderNo());
orderChild.setOrderGoodsNo(orderGoods.getOrderGoodsNo());
orderChild.setFreightPrice(orderGoods.getPendingOrderFreight());
orderChild.setForecastFreightPrice(orderGoods.getForecastOrderFreight());
orderChild.setLossPrice(orderGoods.getLossPrice());
orderChild.setOrderFreightPrice(orderInfo.getValidFreightPrice());
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerMqHandlerServiceImpl.java
浏览文件 @ 908823f0
package com.clx.performance.service.impl.broker;
import com.clx.order.enums.InvoicingCompanyEnum;
import com.clx.order.enums.QuotationEnum;
import com.clx.order.feign.InvoicingCompanyFeign;
import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
import com.clx.performance.dao.OrderChildDao;
......@@ -65,12 +68,17 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
@Autowired
private QuotationService quotationService;
@Autowired
private InvoicingCompanyFeign invoicingCompanyFeign;
@Transactional(rollbackFor = Exception.class)
@Override
public void orderChildSync(BrokerOrderChildSyncMqParam mq) {
try{
doOrderChildSync(mq);
// 同步-无车承运成功后，更新开票标识为普通单
updateInvoiceTypeByChildNo(mq.getChildNo());
}catch (Exception e){
log.info("无车承运-运单同步 失败，msg:{}", ExceptionUtils.getStackTrace(e));
......@@ -94,8 +102,11 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
settlementOrderChildRisk.setPoundAuditTime(settlementOwnerDetail.getPoundAuditTime());
settlementOrderChildRisk.setRiskType(SettlementOrderChildRiskEnum.RiskType.SETTLE_FAIL.getCode());
settlementOrderChildRisk.setRiskRemark("同步无车承运异常");
settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
// 若开票配置为是
if (this.invoiceConfigType(orderChild.getOrderNo())) {
settlementOrderChildRiskDao.saveEntity(settlementOrderChildRisk);
log.info("当前运单的关联的订单开票配置为是，保存对应封控的信息入库");
}
settlementPostService.riskAdd(settlementOrderChildRisk.getId());
}
}
......@@ -112,17 +123,13 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
.getByChildNo(orderChild.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 获取最新订单报价数据
OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
.orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 更新状态
settlementOwnerDetail.setInvoiceTypeStatus(SettlementOwnerDetailEnum.InvoiceTypeStatus.PROCESSING.getCode());
settlementOwnerDetailDao.updateInvoiceTypeStatus(settlementOwnerDetail);
try{
// 同步broker
orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail, quotationDetailVO);
orderChildBrokerService.orderChildSync(orderChild, orderGoods, settlementOwnerDetail, settlementDriverDetail);
} catch (Exception e) {
log.info("同步无车承运失败, child:{}, msg:{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
}
......@@ -144,10 +151,6 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
SettlementDriver settlementDriver = settlementDriverDao
.getByChildNo(orderChild.getChildNo()).orNull();
// 获取最新订单报价数据
OwnerQuotationDetailVO quotationDetailVO = quotationService.getQuotationByOrderNo(orderChild.getOrderNo())
.orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
if (Objects.equals(settlementOwnerDetail.getReportFlag(), com.clx.order.enums.OrderEnum.ReportFlag.NO.getCode())){
return;
}
......@@ -162,7 +165,7 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
try{
// 更新broker
orderChildBrokerService.orderChildUpdate(orderChild, orderGoods, settlementOwnerDetail,
settlementDriverDetail, settlementDriver, quotationDetailVO);
settlementDriverDetail, settlementDriver);
} catch (Exception e) {
log.info("更新无车承运失败, child:{}, msg:{}", orderChild.getChildNo(), ExceptionUtils.getStackTrace(e));
}
......@@ -182,4 +185,40 @@ public class OrderChildBrokerMqHandlerServiceImpl implements OrderChildBrokerMqH
}
/**
* 开票配置为是
*
* @param orderNo
* @return
*/
public boolean invoiceConfigType(String orderNo) {
// 调用开票配置接口
Integer invoiceConfigType = invoicingCompanyFeign.getInvoicingConfigTypeByOrderNo(orderNo).getData();
log.info("notInvoiceConfigType invoiceConfigType:{}", invoiceConfigType);
// 若开票配置为是
return Objects.nonNull(invoiceConfigType) && Objects.equals(invoiceConfigType,
QuotationEnum.InvoicingConfigType.YES.getCode());
}
/**
* 更新当前运单号，更新开票标识为普通单
*/
public void updateInvoiceTypeByChildNo(String childNo) {
// 获取货主详情
SettlementOwnerDetail settlementOwnerDetail = settlementOwnerDetailDao
.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 获取车主详情
SettlementDriverDetail settlementDriverDetail = settlementDriverDetailDao
.getByChildNo(childNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 开票配置为否时，更新开票标识为普通单
if (!this.invoiceConfigType(settlementOwnerDetail.getOrderNo())) {
// 货主更新开票标识
settlementOwnerDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
settlementOwnerDetailDao.updateEntityByKey(settlementOwnerDetail);
// 车主更新开票标识
settlementDriverDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
settlementDriverDetailDao.updateEntityByKey(settlementDriverDetail);
}
}
}
clx-performance-web/src/main/java/com/clx/performance/service/impl/broker/OrderChildBrokerServiceImpl.java
浏览文件 @ 908823f0
package com.clx.performance.service.impl.broker;
import com.clx.order.enums.QuotationEnum;
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.order.vo.pc.owner.OwnerQuotationDetailVO;
import com.clx.performance.dao.OrderChildImageDao;
import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.PowerTypeEnum;
import com.clx.performance.enums.settle.SettlementDriverEnum;
import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
......@@ -43,6 +42,7 @@ import java.util.Objects;
@Service
public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
private static final String LONG_TERM_TIME = "2099-01-01 00:00:00";
private static final String ZERO_STR = "0";
@Autowired
private BrokerService brokerService;
......@@ -68,20 +68,19 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
@Override
public void orderChildSync(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
SettlementDriverDetail settlementDriverDetail, OwnerQuotationDetailVO quotationDetailVO) {
SettlementDriverDetail settlementDriverDetail) {
TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail,
settlementDriverDetail, null, quotationDetailVO);
settlementDriverDetail, null);
brokerService.orderChildSync(transportParam);
}
@Override
public void orderChildUpdate(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
OwnerQuotationDetailVO quotationDetailVO) {
SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver) {
TransportParam transportParam = buildParam(orderChild, orderGoods, settlementOwnerDetail,
settlementDriverDetail, settlementDriver, quotationDetailVO);
settlementDriverDetail, settlementDriver);
// 运单更新
brokerService.orderChildUpdate(transportParam);
......@@ -95,13 +94,14 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
}
private TransportParam buildParam(OrderChild orderChild, OrderGoods orderGoods, SettlementOwnerDetail settlementOwnerDetail,
SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver,
OwnerQuotationDetailVO quotationDetailVO){
SettlementDriverDetail settlementDriverDetail, SettlementDriver settlementDriver){
String host = documentFeign.getHost().getData();
FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderGoods.getOrderNo());
OwnerInfoFeignVO ownerInfoFeign = ownerFeign.getOwnerInfo(orderInfoFeign.getOwnerUserNo()).getData();
//String ownerMobile = ownerFeign.getOwnerInfo(orderInfoFeign.getOwnerUserNo()).getData().getMobile();
String ownerMobile = String.valueOf(orderInfoFeign.getOwnerUserNo());
String ownerName = ownerInfoFeign.getName();
FeignAddressVO data = addressFeign.getSendAndReceiveAddress(orderChild.getSendAddressId(), orderChild.getReceiveAddressId()).getData();
FeignAddressVO.Address receiveAddress = data.getReceiveAddress();
......@@ -118,13 +118,19 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
TruckInfoFeignVo truckInfoFeignVo = truckFeign.getTruckInfoWithTransport(orderChild.getTruckId()).getData();
InvoicingCompanyVO invoicingCompanyByGroupCode = invoicingCompanyService.getInvoicingCompanyByGroupCode(orderChild.getInvoicingCompanyGroupCode());
// 参数组装
TransportParam transportParam = new TransportParam();
transportParam.setTransportPlatformCode(invoicingCompanyByGroupCode.getNetworkCargoCompanyCode());
// 与承运平台约定默认设置0字符串
transportParam.setTransportPlatformCode(ZERO_STR);
// 若有开票配置，且开票配置为是，则使用开票配置的平台编码
if (Objects.equals(settlementOwnerDetail.getInvoiceConfigType(), QuotationEnum.InvoicingConfigType.YES.getCode())) {
InvoicingCompanyVO invoicingCompanyByGroupCode = invoicingCompanyService.getInvoicingCompanyByGroupCode(orderChild.getInvoicingCompanyGroupCode());
transportParam.setTransportPlatformCode(invoicingCompanyByGroupCode.getNetworkCargoCompanyCode());
}
transportParam.setOrderCode(orderChild.getChildNo());
transportParam.setOwnerMobile(ownerMobile);
transportParam.setOwnerName(ownerName);
// 货单
OpenOrderDTO orderInfo = new OpenOrderDTO();
......@@ -304,9 +310,9 @@ public class OrderChildBrokerServiceImpl implements OrderChildBrokerService {
orderChildInfo.setSettleStatus(settlementDriver!=null
&& Objects.equals(settlementDriver.getStatus(), SettlementDriverEnum.Status.SETTLED.getCode())? 1 : 0);
// 开票票配置
orderChildInfo.setInvoiceNeed(quotationDetailVO.getInvoiceConfigType());
orderChildInfo.setInvoiceNeed(settlementOwnerDetail.getInvoiceConfigType());
// 预估运费单价
orderChildInfo.setPredictFreightPrice(quotationDetailVO.getForecastFreightQuotation().intValue());
orderChildInfo.setPredictFreightPrice(orderChild.getForecastFreightPrice().intValue());
transportParam.setOrder(orderInfo);
transportParam.setOrderChildImage(imageList);
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementDriverDetailServiceImpl.java
浏览文件 @ 908823f0
......@@ -2,7 +2,10 @@ package com.clx.performance.service.impl.settle;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.order.enums.InvoicingCompanyEnum;
import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
import com.clx.performance.dao.settle.SettlementDriverDetailDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
import com.clx.performance.enums.settle.SettlementDriverEnum;
import com.clx.performance.enums.settle.SettlementOwnerEnum;
......@@ -75,10 +78,6 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai
// 结算金额
settlementDriverDetail.setSettlementFreight(settlementFreightCalc(settlementDriverDetail.getFreight(), settlementDriverDetail.getLossFreight()));
settlementDriverDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
settlementDriverDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
settlementDriverDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
// 平台服务费： 司机结算金额*平台服务费费率
settlementDriverDetail.setPlatformServiceFeeRate(orderChild.getPlatformServiceFeeRate()==null
? BigDecimal.ZERO
......@@ -89,8 +88,12 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai
// 开票配置
Integer invoiceConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
if (Objects.nonNull(invoiceConfigType)) {
settlementDriverDetail.setInvoiceConfigType(invoiceConfigType);
settlementDriverDetail.setInvoiceConfigType(invoiceConfigType);
if (Objects.nonNull(invoiceConfigType) && Objects.equals(invoiceConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
//设置开票公司信息
settlementDriverDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
settlementDriverDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
settlementDriverDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
}
settlementDriverDetailDao.saveEntity(settlementDriverDetail);
......@@ -195,7 +198,7 @@ public class SettlementDriverDetailServiceImpl implements SettlementDriverDetai
rowData.add(new ExcelData(dto.getGoodsName()));
rowData.add(new ExcelData(dto.getTruckNo()));
// 开票配置
rowData.add(new ExcelData(dto.getInvoicingConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoicingConfigType())));
rowData.add(new ExcelData(dto.getInvoiceConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoiceConfigType())));
rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
rowData.add(new ExcelData(dto.getPrepayFreightFlag()==null?null:SettlementDriverEnum.PrepayFreightFlag.getMsgByCode(dto.getPrepayFreightFlag())));
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java
浏览文件 @ 908823f0
......@@ -5,6 +5,8 @@ import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.order.enums.InvoicingCompanyEnum;
import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
import com.clx.performance.dao.OrderChildDao;
import com.clx.performance.dao.settle.SettlementDriverDetailDao;
......@@ -101,6 +103,8 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
@Autowired
private InvoicingCompanyService invoicingCompanyService;
@Autowired
private OrderFeign orderFeign;
@Override
public Integer saveSettlementDetail(OrderChild orderChild, OrderGoods orderGoods, SettlementDriverDetail settlementDriverDetail) {
......@@ -147,15 +151,33 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
//借款抵扣金额初始化
settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
// 查询开票公司
InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 开票配置
Integer invoiceConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
settlementOwnerDetail.setInvoiceConfigType(invoiceConfigType);
// 开票服务率
settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
if (orderChild.getInvoicingCompanyId() != null) {
FeignOrderVO feignOrderVO = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());
if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
if (Objects.equals(settlementOwnerDetail.getInvoiceConfigType(), InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
//设置开票公司信息
settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
// 查询开票公司
InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
}
}
}
// 开票服务费
......@@ -165,20 +187,6 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
settlementOwnerDetail.setInvoiceFreight(
settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
// 开票配置
Integer invoicingConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
settlementOwnerDetail.setInvoiceConfigType(invoicingConfigType);
// 若开票配置为否，设置开票标识为普通单
if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.NO.getCode())) {
// 赋值开票标识为普通单
settlementDriverDetail.setInvoiceType(InvoicingCompanyEnum.RiskProcessType.AUTO.getCode());
// 若开票配置非空，且为是，则开票公司信息
} else if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
//设置开票公司信息
settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
}
// 结算金额
settlementOwnerDetail.setSettlementFreight(
......@@ -585,7 +593,7 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
rowData.add(new ExcelData(dto.getInvoiceFreight()==null?null:dto.getInvoiceFreight().movePointLeft(2)));
rowData.add(new ExcelData(dto.getInvoicingCompanyShorterName()));
rowData.add(new ExcelData(dto.getInvoiceType()==null?null:SettlementOwnerEnum.InvoiceType.getMsgByCode(dto.getInvoiceType())));
rowData.add(new ExcelData(dto.getInvoicingConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoicingConfigType())));
rowData.add(new ExcelData(dto.getInvoiceConfigType()==null?null:SettlementOwnerEnum.InvoiceConfigType.getMsgByCode(dto.getInvoiceConfigType())));
rowData.add(new ExcelData(dto.getOrderNo()));
rowData.add(new ExcelData(dto.getSettlementNo()));
rowData.add(new ExcelData(dto.getCreateTime()));
......
clx-performance-web/src/main/java/com/clx/performance/strategy/impl/OwnGoodsOrderStrategy.java
浏览文件 @ 908823f0
......@@ -134,6 +134,7 @@ public class OwnGoodsOrderStrategy extends GoodsOrderStrategy implements Initial
}
orderGoods.setPendingOrderTime(postedTime);
orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
orderGoods.setForecastOrderFreight(orderInfo.getValidForecastFreightQuotation());
orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
//定向运单失效时间
......
clx-performance-web/src/main/java/com/clx/performance/strategy/impl/PartGoodsOrderStrategy.java
浏览文件 @ 908823f0
......@@ -136,6 +136,7 @@ public class PartGoodsOrderStrategy extends GoodsOrderStrategy implements Initia
orderGoods.setPendingOrderTime(postedTime);
orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
orderGoods.setForecastOrderFreight(orderInfo.getValidForecastFreightQuotation());
orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
//定向运单失效时间
......
clx-performance-web/src/main/java/com/clx/performance/strategy/impl/PlatformGoodsOrderStrategy.java
浏览文件 @ 908823f0
......@@ -133,6 +133,7 @@ public class PlatformGoodsOrderStrategy extends GoodsOrderStrategy implements In
orderGoods.setPendingOrderTime(postedTime);
orderGoods.setPendingOrderFreight(child.getPendingOrderFreight());
orderGoods.setForecastOrderFreight(orderInfo.getValidForecastFreightQuotation());
orderGoods.setLastArriveSendTime(DateUtils.parseDateTime(child.getLastArriveSendTime()).get());
//定向运单失效时间
......
performance-api/src/main/java/com/clx/performance/vo/pc/broker/TransportParam.java
浏览文件 @ 908823f0
......@@ -29,6 +29,9 @@ public class TransportParam {
@NotBlank(message = "货主手机号（货主账号）不能为空")
private String ownerMobile;
@Schema(description = "货主用户名字", example = "", required = true)
private String ownerName;
@Schema(description = "运单编号", required = true)
@NotBlank(message = "运单编号不能为空")
private String orderCode;
......
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverDetailVO.java
浏览文件 @ 908823f0
......@@ -79,7 +79,7 @@ public class CarrierPageSettlementDriverDetailVO {
@Schema(description = "开票公司简称")
private String invoicingCompanyShorterName;
@Schema(description = "开票配置")
private Integer invoicingConfigType;
private Integer invoiceConfigType;
@MoneyOutConvert
@Schema(description = "平台服务费")
private BigDecimal platformServiceFee;
......
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerDetailVO.java
浏览文件 @ 908823f0
......@@ -75,7 +75,7 @@ public class CarrierPageSettlementOwnerDetailVO {
@Schema(description = "开票服务率")
private BigDecimal invoiceServiceFeeRate;
@Schema(description = "开票配置：0-否，1-是")
private Integer invoicingConfigType;
private Integer invoiceConfigType;
@MoneyOutConvert
@Schema(description = "借款抵扣金额")
private BigDecimal loanFreight;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论