Skip to content

C
clx-performance
提交 9065c768 authored 作者: liruixin's avatar liruixin
浏览文件
操作

操作增加日志

上级 46fe9298
显示空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 15 行删除
performance-api/src/main/java/com/clx/performance/enums/settle/SettlementLogEnum.java
浏览文件 @ 9065c768
......@@ -18,10 +18,10 @@ public enum SettlementLogEnum {
UPLOAD_SETTLEMENT (2, "上传结算凭证"),
OWNER_TO_BE_CONFIRMED(3, "货主确认结算单"),
SHIPPER_TO_PAYMENT(4, "货主付款"),
PLATFORM_CONFIRMED_OWNER_PAYMENT(5, "待平台确认付款"),
PLATFORM_CONFIRMED_OWNER_PAYMENT(5, "平台确认付款"),
PLATFORM_TO_PAYMENT(6, "平台付款"),
OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "待货主确认付款"),
INVOICE_TO_BE_MAILED(8, "待邮寄发票"),
OWNER_CONFIRMED_PLATFORM_PAYMENT(7, "货主确认付款"),
INVOICE_TO_BE_MAILED(8, "邮寄发票"),
COMPLETED(9, "已完结"),
;
......
performance-api/src/main/java/com/clx/performance/param/pc/owner/PageCarrierSettlementOwnerParam.java
浏览文件 @ 9065c768
......@@ -22,6 +22,6 @@ public class PageCarrierSettlementOwnerParam extends PageParam {
@ApiModelProperty(value="货主编码",example = "201457878")
private Long ownerUserNo;
@ApiModelProperty(value="状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:平台确认货主付款 60:待平台付款 70:货主确认平台付款 80:待邮寄发票 90:已完结",example = "10")
@ApiModelProperty(value="状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结",example = "10")
private String status;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementOwnerVO.java
浏览文件 @ 9065c768
......@@ -50,6 +50,6 @@ public class CarrierPageSettlementOwnerVO {
private BigDecimal invoiceFreight;
@ApiModelProperty(value = "创建时间")
private String createTime;
@ApiModelProperty(value = "状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:平台确认货主付款 60:待平台付款 70:货主确认平台付款 80:待邮寄发票 90:已完结")
@ApiModelProperty(value = "状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")
private Integer status;
}
performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierSettlementOwnerDetailVO.java
浏览文件 @ 9065c768
......@@ -132,10 +132,10 @@ public class CarrierSettlementOwnerDetailVO {
@ApiModelProperty(value = "开票状态Msg 1-已开票 2-部分开票 3-无需开票", example = "无需开票")
private String invoiceStatusMsg;
@ApiModelProperty(value = "状态code 1-待锁定,2-待对账,3-待货主确认,4-待货主付款,5-付款待确认,6-待邮寄发票,7-待平台付款,8-已完结", example = "1")
@ApiModelProperty(value = "状态code 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结", example = "10")
private Integer statusCode;
@ApiModelProperty(value = "状态Msg 1-待锁定,2-待对账,3-待货主确认,4-待货主付款,5-付款待确认,6-待邮寄发票,7-待平台付款,8-已完结", example = "待锁定")
@ApiModelProperty(value = "状态Msg", example = "待锁定")
private String statusMsg;
@ApiModelProperty(value = "驳回原因", example = "驳回原因")
......
performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/OwnerPageSettlementOwnerVO.java
浏览文件 @ 9065c768
......@@ -50,6 +50,6 @@ public class OwnerPageSettlementOwnerVO {
private BigDecimal invoiceFreight;
@ApiModelProperty(value = "创建时间")
private String createTime;
@ApiModelProperty(value = "状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:平台确认货主付款 60:待平台付款 70:货主确认平台付款 80:待邮寄发票 90:已完结")
@ApiModelProperty(value = "状态 10:待锁定 20:待对账 30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结")
private Integer status;
}
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @ 9065c768
......@@ -173,7 +173,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
SettlementLogEnum.Type.OWNER_CONFIRMED_PLATFORM_PAYMENT.getCode(),SettlementLogEnum.Type.OWNER_CONFIRMED_PLATFORM_PAYMENT.getMsg(),
OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
if(Objects.equals(settlementOwner.getStatus(),SettlementOwnerEnum.InvoiceType.ONLINE.getCode())){//网运单
if(Objects.equals(settlementOwner.getInvoiceStatus(),SettlementOwnerEnum.InvoiceType.ONLINE.getCode())){//网运单
status = SettlementOwnerEnum.Status.COMPLETED.getCode();
//保存结算单日志
settlementLogService.saveSettlementLog(settlementNo,
......@@ -294,23 +294,42 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
}
@Override
public void uploadInvoiceImg(UploadInvoiceImgParam param){
settlementOwnerDao.uploadInvoiceImg(param.getSettlementNo(),param.getInvoiceImg());
String settlementNo = param.getSettlementNo();
settlementOwnerDao.uploadInvoiceImg(settlementNo,param.getInvoiceImg());
settlementOwnerDao.updateStatusBySettlementNo(param.getSettlementNo()
settlementOwnerDao.updateStatusBySettlementNo(settlementNo
,SettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode());
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
//保存结算单日志----上传结算凭证
settlementLogService.saveSettlementLog(settlementNo,
SettlementLogEnum.Type.UPLOAD_SETTLEMENT.getCode(),SettlementLogEnum.Type.UPLOAD_SETTLEMENT.getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
}
@Override
public void saveExpress(SaveExpressParam param){
settlementOwnerDao.saveExpress(param.getSettlementNo(),param.getExpressCompany(),param.getExpressNo());
String settlementNo = param.getSettlementNo();
settlementOwnerDao.saveExpress(settlementNo,param.getExpressCompany(),param.getExpressNo());
settlementOwnerDao.updateStatusBySettlementNo(param.getSettlementNo()
settlementOwnerDao.updateStatusBySettlementNo(settlementNo
,SettlementOwnerEnum.Status.COMPLETED.getCode());
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
//保存结算单日志----邮寄发票
settlementLogService.saveSettlementLog(settlementNo,
SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getCode(),SettlementLogEnum.Type.INVOICE_TO_BE_MAILED.getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
//保存结算单日志----已完结
settlementLogService.saveSettlementLog(settlementNo,
SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
}
@Override
public void savePayee(SavePayeeParam param){
settlementOwnerDao.savePayee(param.getSettlementNo(),
String settlementNo = param.getSettlementNo();
settlementOwnerDao.savePayee(settlementNo,
param.getPayee(),
param.getPayeeBankName(),
param.getPayeeBankCardNo(),
......@@ -319,8 +338,13 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
param.getPaymentBankName(),
param.getPaymentAmount());
settlementOwnerDao.updateStatusBySettlementNo(param.getSettlementNo()
settlementOwnerDao.updateStatusBySettlementNo(settlementNo
,SettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode());
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
//保存结算单日志----平台付款
settlementLogService.saveSettlementLog(settlementNo,
SettlementLogEnum.Type.PLATFORM_TO_PAYMENT.getCode(),SettlementLogEnum.Type.PLATFORM_TO_PAYMENT.getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
}
@Override
......@@ -331,6 +355,20 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
@Override
public void payeeConfirm(String settlementNo){
settlementOwnerDao.updateStatusBySettlementNo(settlementNo,SettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode());
SettlementOwner settlementOwner = settlementOwnerDao.selectBySettlementNo(settlementNo).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
//保存结算单日志
settlementLogService.saveSettlementLog(settlementNo,
SettlementLogEnum.Type.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode(),SettlementLogEnum.Type.PLATFORM_CONFIRMED_OWNER_PAYMENT.getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
if(Objects.equals(settlementOwner.getInvoiceStatus(),SettlementOwnerEnum.InvoiceType.ONLINE.getCode())){//网运单
//保存结算单日志
settlementLogService.saveSettlementLog(settlementNo,
SettlementLogEnum.Type.COMPLETED.getCode(),SettlementLogEnum.Type.COMPLETED.getMsg(),
OrderChildLogEnum.CreateType.PLATFORM.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论