Skip to content

C
clx-performance
提交 3a2945a8 authored 作者: 马路路's avatar 马路路
浏览文件
操作

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

Former-commit-id: d5353d54
上级 421fbb6a c1999515
隐藏空白字符变更
内嵌 并排
正在显示 包含 66 行增加 和 37 行删除
clx-performance-web/src/main/java/com/clx/performance/controller/pc/OrderChildExceptionReportController.java
浏览文件 @ 3a2945a8
......@@ -61,6 +61,7 @@ public class OrderChildExceptionReportController {
@Operation(summary = "异常上报详情接口", description = "<br>By:刘海泉")
@GetMapping(value = "getExceptionReport")
@UnitCovert(param = false)
public Result<OrderChildExceptionReportVO> getExceptionReport(@RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
return Result.ok(orderChildExceptionReportService.getExceptionReport(id));
}
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/OrderChildExceptionReportServiceImpl.java
浏览文件 @ 3a2945a8
......@@ -42,6 +42,7 @@ import com.msl.common.result.Result;
import com.msl.common.utils.DateUtils;
import com.msl.user.data.UserSessionData;
import com.msl.user.utils.TokenUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
......@@ -232,6 +233,9 @@ public class OrderChildExceptionReportServiceImpl implements OrderChildExceptio
if(Objects.equals(param.getDealWay(),ExceptionReportEnum.DealWay.APPEAL.getCode())){
report.setStatus(CarrierExceptionReportEnum.Status.APPEAL_IN_PROGRESS.getCode());
report.setDealTime(LocalDateTime.now());
report.setDealUserCode(loginUserInfo.getUserNo());
report.setDealUser(loginUserInfo.getUserName());
dealLog = new OrderChildExceptionReportDealLog();
dealLog.setReportNo(report.getReportNo());
dealLog.setDealWay(param.getDealWay());
......@@ -362,6 +366,10 @@ public class OrderChildExceptionReportServiceImpl implements OrderChildExceptio
OrderChildExceptionReportDealLog::getReportNo, report.getReportNo());
if(limitOneByField.isPresent()) {
OrderChildExceptionReportDealLog dealLog = limitOneByField.get();
vo.setDealWay(dealLog.getDealWay());
vo.setAppealReason(dealLog.getAppealReason());
vo.setCreateName(dealLog.getCreateName());
vo.setAppealTime(DateUtils.formatDateTime(dealLog.getCreateTime()).get());
vo.setAppealPictureUrlList(JSON.parseArray(dealLog.getPictureUrl(),String.class));
vo.setAppealVideoUrlList(JSON.parseArray(dealLog.getVideoUrl(),String.class));
}
......@@ -379,7 +387,7 @@ public class OrderChildExceptionReportServiceImpl implements OrderChildExceptio
if(Objects.equals(report.getStatus(),CarrierExceptionReportEnum.Status.PROCESSED.getCode())
&& Objects.equals(report.getDealResult(),ExceptionReportEnum.DealResult.CARRIER_BREAK_CONTRACT.getCode())){
//创建司机违约记录
saveDriverBreakContractRecord(report);
saveDriverBreakContractRecord(report,param.getReason());
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
report.setTransferDriverBreakContract(1);
......@@ -403,7 +411,7 @@ public class OrderChildExceptionReportServiceImpl implements OrderChildExceptio
orderChildExceptionReportOperationLogDao.saveEntity(operationLog);
}
public void saveDriverBreakContractRecord(OrderChildExceptionReport report){
public void saveDriverBreakContractRecord(OrderChildExceptionReport report,String reason){
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Long userNo = loginUserInfo.getUserNo();
LocalDateTime time = LocalDateTime.now();
......@@ -425,7 +433,7 @@ public class OrderChildExceptionReportServiceImpl implements OrderChildExceptio
record.setExceptionReportNo(report.getReportNo());
record.setPictureUrl(report.getPictureUrlJson());
record.setVideoUrl(report.getVideoUrlJson());
record.setRemark(report.getBreakContractReason());
record.setRemark(reason);
record.setCreateBy(userNo);
record.setCreateName(loginUserInfo.getUserName());
record.setCreateTime(time);
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementMqHandlerServiceImpl.java
浏览文件 @ 3a2945a8
......@@ -3,7 +3,9 @@ package com.clx.performance.service.impl.settle;
import cn.hutool.json.JSONUtil;
import com.clx.order.enums.InvoicingCompanyEnum;
import com.clx.order.enums.QuotationEnum;
import com.clx.order.feign.OrderFeign;
import com.clx.order.vo.feign.FeignOrderInfoVO;
import com.clx.order.vo.feign.FeignOrderVO;
import com.clx.order.vo.pc.carrier.InvoicingCompanyVO;
import com.clx.performance.config.MslPaymentConfig;
import com.clx.performance.constant.RedissonConstants;
......@@ -162,6 +164,8 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
@Autowired
private OrderChildBrokerMqHandlerServiceImpl orderChildBrokerMqHandlerService;
@Autowired
private OrderFeign orderFeign;
@Override
@Transactional(rollbackFor = Exception.class)
......@@ -1098,22 +1102,20 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
OrderGoods orderGoods = orderGoodsDao
.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 查询开票公司
InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
// 开票服务率
settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
}
FeignOrderVO feignOrderVO = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());
if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
// 开票配置为否且当前关联公司为含税，按照含税计算
if (Objects.nonNull(settlementOwnerDetail.getInvoiceConfigType())
&& (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_INCLUDED.getCode()))) {
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
if (settlementOwnerDetail.getInvoicingCompanyId() != null) {
// 查询开票公司
InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
}
}
// 开票服务费
......
clx-performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java
浏览文件 @ 3a2945a8
......@@ -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) {
......@@ -149,6 +153,19 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
// 开票服务率
settlementOwnerDetail.setInvoiceServiceFeeRate(BigDecimal.ZERO);
FeignOrderVO feignOrderVO = orderFeign.getOrderInfoFeign(orderChild.getOrderNo());
if (Objects.equals(feignOrderVO.getPlatformFreightQuotationTaxType(),
InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
if (settlementOwnerDetail.getInvoicingCompanyId() != null) {
// 查询开票公司
InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
settlementOwnerDetail.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
}
}
// 开票服务费
settlementOwnerDetail.setInvoiceServiceFee(
......@@ -157,24 +174,6 @@ public class SettlementOwnerDetailServiceImpl implements SettlementOwnerDetailS
settlementOwnerDetail.setInvoiceFreight(
settlementCommonService.invoiceFreightCalc(orderChild.getSettlementWay(),
orderGoods.getInvoiceServiceFeeRate(), settlementOwnerDetail));
// 开票配置
Integer invoicingConfigType = invoicingCompanyService.getInvoicingConfigTypeByOrderNo(orderChild.getOrderNo());
settlementOwnerDetail.setInvoiceConfigType(invoicingConfigType);
log.info("saveSettlementDetail invoicingConfigType:{}", invoicingConfigType);
// 若开票配置非空，且为是，则开票公司信息，开票标识为空（由后续封控系统处理）
if (Objects.nonNull(invoicingConfigType) && Objects.equals(invoicingConfigType, InvoicingCompanyEnum.YesAndNo.YES.getCode())) {
//设置开票公司信息
settlementOwnerDetail.setInvoicingCompanyId(orderChild.getInvoicingCompanyId());
settlementOwnerDetail.setInvoicingCompanyShorterName(orderChild.getInvoicingCompanyShorterName());
settlementOwnerDetail.setInvoicingCompanyGroupCode(orderChild.getInvoicingCompanyGroupCode());
// 设置开票服务率
InvoicingCompanyVO invoiceCompany = invoicingCompanyService.getInvoicingCompany(
orderChild.getInvoicingCompanyId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
if (Objects.equals(invoiceCompany.getQuotationType(), InvoicingCompanyEnum.TaxType.TAX_EXCLUDED.getCode())) {
settlementOwnerDetail.setInvoiceServiceFeeRate(
invoiceCompany.getServiceFeeRate() == null ? BigDecimal.ZERO : invoiceCompany.getServiceFeeRate());
}
}
// 结算金额
settlementOwnerDetail.setSettlementFreight(
......
clx-performance-web/src/main/java/com/nbopen/api/NBOpenSDK.java
浏览文件 @ 3a2945a8
......@@ -208,8 +208,9 @@ public final class NBOpenSDK {
}
private static void unzipJarJar(String jarPath, String srcPath, String dstPath) {
JarFile jarFile = null;
try {
JarFile jarFile = new JarFile(jarPath);
jarFile = new JarFile(jarPath);
Enumeration<JarEntry> entries = jarFile.entries();
while(entries.hasMoreElements()) {
......@@ -233,11 +234,20 @@ public final class NBOpenSDK {
}
} catch (Exception var10) {
var10.printStackTrace();
} finally {
if (jarFile != null) {
try {
jarFile.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
private static File unpackToFolder(File jarPath, NBClassLoader classLoader) {
JarFile jarFile = null;
try {
String userDir = System.getProperty("user.dir");
System.out.println("nbsdk-userDir: " + userDir);
......@@ -251,7 +261,7 @@ public final class NBOpenSDK {
}
folder.deleteOnExit();
JarFile jarFile = new JarFile(jarPath);
jarFile = new JarFile(jarPath);
Enumeration<JarEntry> entries = jarFile.entries();
while(entries.hasMoreElements()) {
......@@ -272,6 +282,14 @@ public final class NBOpenSDK {
} catch (Exception var12) {
System.out.println("nbsdk- unpack to folder error" + var12);
throw new RuntimeException(var12);
} finally {
if (jarFile != null) {
try {
jarFile.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
}
......
performance-api/src/main/java/com/clx/performance/vo/pc/OrderChildExceptionReportVO.java
浏览文件 @ 3a2945a8
......@@ -136,7 +136,8 @@ public class OrderChildExceptionReportVO {
@Schema(description="处理方式 1:同意扣罚 2：申诉")
private Integer dealWay;
@Schema(description="申诉时间")
private String appealTime;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论