|
|
@@ -317,11 +317,11 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
|
|
|
if (orderInfo != null) {
|
|
|
if ("1".equals(hyCarrierInfo.getLoadingFlag())) {
|
|
|
if ("1".equals(hyCarrierInfo.getFlag())) {
|
|
|
- //确认装车
|
|
|
- orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
|
|
|
- orderInfo.setOrderStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
|
|
|
- orderInfo.setCargoOwnerStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
|
|
|
- orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
|
|
|
+// //确认装车
|
|
|
+// orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
|
|
|
+// orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
|
|
|
+// orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
|
|
|
+// orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
|
|
|
//查询订单是否垫付
|
|
|
if ("0".equals(orderInfo.getFreightAdvance())) {
|
|
|
//生成货主冻结金额流向信息
|
|
|
@@ -364,129 +364,132 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
|
|
|
}
|
|
|
hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
|
|
|
}
|
|
|
+ String skipAudit="";
|
|
|
//查询货主是否为公司
|
|
|
if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
|
|
|
//查询该公司是否自动跳过平台审核
|
|
|
HyCompanyInfo hyCompanyInfo1 = companyInfoService.selectById(orderInfo.getCompId());
|
|
|
- if ("1".equals(hyCompanyInfo1.getSkipAudit())) {
|
|
|
- //平台确认装车更改订单状态
|
|
|
- orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
|
|
|
- orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
|
|
|
- orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
|
|
|
- orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
|
|
|
- //生成费用信息
|
|
|
- FreightInfo freightInfo = new FreightInfo();
|
|
|
- freightInfo.setId(IdGenerator.generateUUID());
|
|
|
- freightInfo.setOrderId(orderInfo.getId());
|
|
|
- freightInfo.setDriverServiceCharge(0d);
|
|
|
- freightInfo.setPayableFreight(orderInfo.getAdvanceCharge());
|
|
|
- freightInfo.setPayabledFreight(0d);
|
|
|
- freightInfo.setNopayableFreight(freightInfo.getPayableFreight());
|
|
|
- //判断是否是垫付订单
|
|
|
- if ("0".equals(orderInfo.getFreightAdvance())) {
|
|
|
- //非垫付订单
|
|
|
- freightInfo.setPrepaidFreight(orderInfo.getAdvanceCharge());
|
|
|
+ skipAudit=hyCompanyInfo1.getSkipAudit();
|
|
|
+ }
|
|
|
+ //设置自动跳过平台审核的货主或者个人货主
|
|
|
+ if ("1".equals(skipAudit)||orderInfo.getCompId() == null) {
|
|
|
+ //平台确认装车更改订单状态
|
|
|
+ orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
|
|
|
+ orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
|
|
|
+ orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
|
|
|
+ orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
|
|
|
+ //生成费用信息
|
|
|
+ FreightInfo freightInfo = new FreightInfo();
|
|
|
+ freightInfo.setId(IdGenerator.generateUUID());
|
|
|
+ freightInfo.setOrderId(orderInfo.getId());
|
|
|
+ freightInfo.setDriverServiceCharge(0d);
|
|
|
+ freightInfo.setPayableFreight(orderInfo.getAdvanceCharge());
|
|
|
+ freightInfo.setPayabledFreight(0d);
|
|
|
+ freightInfo.setNopayableFreight(freightInfo.getPayableFreight());
|
|
|
+ //判断是否是垫付订单
|
|
|
+ if ("0".equals(orderInfo.getFreightAdvance())) {
|
|
|
+ //非垫付订单
|
|
|
+ freightInfo.setPrepaidFreight(orderInfo.getAdvanceCharge());
|
|
|
// freightInfo.setReceivableFreight(orderInfo.getAdvanceCharge());
|
|
|
// freightInfo.setReceivabledFreight(orderInfo.getAdvanceCharge());
|
|
|
|
|
|
- //生成货主冻结金额流向信息
|
|
|
- HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
|
|
|
- hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
|
|
|
- hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
|
|
|
- hyFreezingMoneyInfo.setType("扣除");
|
|
|
- hyFreezingMoneyInfo.setAmountMoney(orderInfo.getAdvanceCharge());
|
|
|
+ //生成货主冻结金额流向信息
|
|
|
+ HyFreezingMoneyInfo hyFreezingMoneyInfo = new HyFreezingMoneyInfo();
|
|
|
+ hyFreezingMoneyInfo.setId(IdGenerator.generateUUID());
|
|
|
+ hyFreezingMoneyInfo.setOrderId(orderInfo.getId());
|
|
|
+ hyFreezingMoneyInfo.setType("扣除");
|
|
|
+ hyFreezingMoneyInfo.setAmountMoney(orderInfo.getAdvanceCharge());
|
|
|
|
|
|
- if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
|
|
|
- //货主是公司
|
|
|
- HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
|
|
|
- //将货主冻结金额减去
|
|
|
- Double d1 = hyCompanyInfo.getFrozenAmount();
|
|
|
- hyCompanyInfo.setFrozenAmount(d1 - orderInfo.getAdvanceCharge());
|
|
|
- companyInfoService.updateById(hyCompanyInfo);
|
|
|
- hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
|
|
|
- if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
|
|
|
- //生成货主账单信息
|
|
|
- HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
|
|
|
- hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
|
|
|
- hyCargoOwnerCapitalInfo.setCompanyId(hyCompanyInfo.getId());
|
|
|
- hyCargoOwnerCapitalInfo.setTypes("支付预付款");
|
|
|
- hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getReceivableFreight());
|
|
|
- hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
|
|
|
- hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
|
|
|
- hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
|
|
|
- }
|
|
|
- } else {
|
|
|
- //货主是个人
|
|
|
- HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
|
|
|
- .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
|
|
|
- //将货主冻结金额减去
|
|
|
- Double d1 = hyCargoOwnerInfo.getFrozenAmount();
|
|
|
- hyCargoOwnerInfo.setFrozenAmount(d1 - orderInfo.getAdvanceCharge());
|
|
|
- cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
|
|
|
- hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
|
|
|
- if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
|
|
|
- //生成货主账单信息
|
|
|
- HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
|
|
|
- hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
|
|
|
- hyCargoOwnerCapitalInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
|
|
|
- hyCargoOwnerCapitalInfo.setTypes("支付预付款");
|
|
|
- hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getReceivableFreight());
|
|
|
- hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
|
|
|
- hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
|
|
|
- hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
|
|
|
- }
|
|
|
- }
|
|
|
- hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
|
|
|
+ if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
|
|
|
//货主是公司
|
|
|
- if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
|
|
|
- //计算公司累计支付运费
|
|
|
- HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
|
|
|
- if (hyCompanyInfo != null) {
|
|
|
- Double d3 = hyCompanyInfo.getAccumulatedFreight();
|
|
|
- hyCompanyInfo.setAccumulatedFreight(d3 + orderInfo.getAdvanceCharge());
|
|
|
- companyInfoService.updateById(hyCompanyInfo);
|
|
|
- }
|
|
|
+ HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
|
|
|
+ //将货主冻结金额减去
|
|
|
+ Double d1 = hyCompanyInfo.getFrozenAmount();
|
|
|
+ hyCompanyInfo.setFrozenAmount(d1 - orderInfo.getAdvanceCharge());
|
|
|
+ companyInfoService.updateById(hyCompanyInfo);
|
|
|
+ hyFreezingMoneyInfo.setCompanyId(hyCompanyInfo.getId());
|
|
|
+ if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
|
|
|
+ //生成货主账单信息
|
|
|
+ HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
|
|
|
+ hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
|
|
|
+ hyCargoOwnerCapitalInfo.setCompanyId(hyCompanyInfo.getId());
|
|
|
+ hyCargoOwnerCapitalInfo.setTypes("支付预付款");
|
|
|
+ hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getReceivableFreight());
|
|
|
+ hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
|
|
|
+ hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
|
|
|
+ hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
|
|
|
}
|
|
|
+ } else {
|
|
|
//货主是个人
|
|
|
- else {
|
|
|
- //查询货主
|
|
|
- HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
|
|
|
- .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
|
|
|
- //计算货主累计支付运费
|
|
|
- if (hyCargoOwnerInfo != null) {
|
|
|
- Double d3 = hyCargoOwnerInfo.getAccumulatedFreight();
|
|
|
- hyCargoOwnerInfo.setAccumulatedFreight(d3 + orderInfo.getAdvanceCharge());
|
|
|
- cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
|
|
|
- }
|
|
|
+ HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
|
|
|
+ .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
|
|
|
+ //将货主冻结金额减去
|
|
|
+ Double d1 = hyCargoOwnerInfo.getFrozenAmount();
|
|
|
+ hyCargoOwnerInfo.setFrozenAmount(d1 - orderInfo.getAdvanceCharge());
|
|
|
+ cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
|
|
|
+ hyFreezingMoneyInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
|
|
|
+ if (freightInfo.getReceivableFreight() != null && freightInfo.getReceivableFreight() != 0) {
|
|
|
+ //生成货主账单信息
|
|
|
+ HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo = new HyCargoOwnerCapitalInfo();
|
|
|
+ hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
|
|
|
+ hyCargoOwnerCapitalInfo.setCommonId(hyCargoOwnerInfo.getCommonId());
|
|
|
+ hyCargoOwnerCapitalInfo.setTypes("支付预付款");
|
|
|
+ hyCargoOwnerCapitalInfo.setAmountMoney(freightInfo.getReceivableFreight());
|
|
|
+ hyCargoOwnerCapitalInfo.setOrderId(orderInfo.getId());
|
|
|
+ hyCargoOwnerCapitalInfo.setOrderNo(orderInfo.getOrderNo());
|
|
|
+ hyCargoOwnerCapitalInfoService.insert(hyCargoOwnerCapitalInfo);
|
|
|
}
|
|
|
}
|
|
|
- freightInfoService.insert(freightInfo);
|
|
|
- //如果应付款大于0，生成司机运费结算信息
|
|
|
- if (freightInfo.getPayableFreight() != null && freightInfo.getPayableFreight() != 0) {
|
|
|
- HyFreightSettlementInfo hyFreightSettlementInfo = new HyFreightSettlementInfo();
|
|
|
- hyFreightSettlementInfo.setId(IdGenerator.generateUUID());
|
|
|
- hyFreightSettlementInfo.setCommonId(orderInfo.getCommonId());
|
|
|
- hyFreightSettlementInfo.setOrderId(orderInfo.getId());
|
|
|
- hyFreightSettlementInfo.setOrderNo(orderInfo.getOrderNo());
|
|
|
- hyFreightSettlementInfo.setDocumentNo(orderInfo.getOrderNo().replace("CY", "ZJLS"));
|
|
|
- hyFreightSettlementInfo.setFreightAdvance(orderInfo.getFreightAdvance());
|
|
|
- hyFreightSettlementInfo.setDriverName(orderInfo.getDriverName());
|
|
|
- hyFreightSettlementInfo.setPayeeName(orderInfo.getPayeeName());
|
|
|
- hyFreightSettlementInfo.setPayeeIdCard(orderInfo.getPayeeIdCard());
|
|
|
- if (orderInfo.getCarCaptainCommonId() != null && !orderInfo.getCarCaptainCommonId().isEmpty()) {
|
|
|
- hyFreightSettlementInfo.setCarCaptainCommonId(orderInfo.getCarCaptainCommonId());
|
|
|
+ hyFreezingMoneyInfoService.insert(hyFreezingMoneyInfo);
|
|
|
+ //货主是公司
|
|
|
+ if (orderInfo.getCompId() != null && !orderInfo.getCompId().isEmpty()) {
|
|
|
+ //计算公司累计支付运费
|
|
|
+ HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(orderInfo.getCompId());
|
|
|
+ if (hyCompanyInfo != null) {
|
|
|
+ Double d3 = hyCompanyInfo.getAccumulatedFreight();
|
|
|
+ hyCompanyInfo.setAccumulatedFreight(d3 + orderInfo.getAdvanceCharge());
|
|
|
+ companyInfoService.updateById(hyCompanyInfo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //货主是个人
|
|
|
+ else {
|
|
|
+ //查询货主
|
|
|
+ HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
|
|
|
+ .eq("common_id", orderInfo.getCargoCommonId()).eq("delete_flag", "0"));
|
|
|
+ //计算货主累计支付运费
|
|
|
+ if (hyCargoOwnerInfo != null) {
|
|
|
+ Double d3 = hyCargoOwnerInfo.getAccumulatedFreight();
|
|
|
+ hyCargoOwnerInfo.setAccumulatedFreight(d3 + orderInfo.getAdvanceCharge());
|
|
|
+ cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
|
|
|
}
|
|
|
- hyFreightSettlementInfo.setBankCard(orderInfo.getBankCard());
|
|
|
- hyFreightSettlementInfo.setBankDeposit(orderInfo.getBankDeposit());
|
|
|
- hyFreightSettlementInfo.setBankDepositBranch(orderInfo.getBankDepositBranch());
|
|
|
- hyFreightSettlementInfo.setPaymentType("预付款");
|
|
|
- hyFreightSettlementInfo.setAmountMoney(freightInfo.getPayableFreight());
|
|
|
- hyFreightSettlementInfo.setStatusKey(StatusEnum.NO_PAYMENT.getFlag());
|
|
|
- hyFreightSettlementInfo.setStatus(StatusEnum.NO_PAYMENT.getName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ freightInfoService.insert(freightInfo);
|
|
|
+ //如果应付款大于0，生成司机运费结算信息
|
|
|
+ if (freightInfo.getPayableFreight() != null && freightInfo.getPayableFreight() != 0) {
|
|
|
+ HyFreightSettlementInfo hyFreightSettlementInfo = new HyFreightSettlementInfo();
|
|
|
+ hyFreightSettlementInfo.setId(IdGenerator.generateUUID());
|
|
|
+ hyFreightSettlementInfo.setCommonId(orderInfo.getCommonId());
|
|
|
+ hyFreightSettlementInfo.setOrderId(orderInfo.getId());
|
|
|
+ hyFreightSettlementInfo.setOrderNo(orderInfo.getOrderNo());
|
|
|
+ hyFreightSettlementInfo.setDocumentNo(orderInfo.getOrderNo().replace("CY", "ZJLS"));
|
|
|
+ hyFreightSettlementInfo.setFreightAdvance(orderInfo.getFreightAdvance());
|
|
|
+ hyFreightSettlementInfo.setDriverName(orderInfo.getDriverName());
|
|
|
+ hyFreightSettlementInfo.setPayeeName(orderInfo.getPayeeName());
|
|
|
+ hyFreightSettlementInfo.setPayeeIdCard(orderInfo.getPayeeIdCard());
|
|
|
+ if (orderInfo.getCarCaptainCommonId() != null && !orderInfo.getCarCaptainCommonId().isEmpty()) {
|
|
|
+ hyFreightSettlementInfo.setCarCaptainCommonId(orderInfo.getCarCaptainCommonId());
|
|
|
+ }
|
|
|
+ hyFreightSettlementInfo.setBankCard(orderInfo.getBankCard());
|
|
|
+ hyFreightSettlementInfo.setBankDeposit(orderInfo.getBankDeposit());
|
|
|
+ hyFreightSettlementInfo.setBankDepositBranch(orderInfo.getBankDepositBranch());
|
|
|
+ hyFreightSettlementInfo.setPaymentType("预付款");
|
|
|
+ hyFreightSettlementInfo.setAmountMoney(freightInfo.getPayableFreight());
|
|
|
+ hyFreightSettlementInfo.setStatusKey(StatusEnum.NO_PAYMENT.getFlag());
|
|
|
+ hyFreightSettlementInfo.setStatus(StatusEnum.NO_PAYMENT.getName());
|
|
|
// hyFreightSettlementInfo.setEscalationStatusKey(StatusEnum.NO_REPORTED.getFlag());
|
|
|
// hyFreightSettlementInfo.setEscalationStatus(StatusEnum.NO_REPORTED.getName());
|
|
|
- hyFreightSettlementInfoService.insert(hyFreightSettlementInfo);
|
|
|
- }
|
|
|
+ hyFreightSettlementInfoService.insert(hyFreightSettlementInfo);
|
|
|
}
|
|
|
}
|
|
|
} else {
|
zhangyuewww