Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
48d0c0ec
提交
48d0c0ec
authored
12月 13, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
开票通知
上级
d93e82e1
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
24 行增加
和
5 行删除
+24
-5
TransportSyncController.java
...ance/controller/pc/transport/TransportSyncController.java
+6
-4
SettlementOwnerServiceImpl.java
...mance/service/impl/settle/SettlementOwnerServiceImpl.java
+16
-0
SettlementOwnerService.java
...lx/performance/service/settle/SettlementOwnerService.java
+2
-1
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/pc/transport/TransportSyncController.java
浏览文件 @
48d0c0ec
...
@@ -20,6 +20,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
...
@@ -20,6 +20,7 @@ import com.clx.performance.model.settle.SettlementOwnerDetail;
import
com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam
;
import
com.clx.performance.param.feign.transport.ThirdOrderChildBrokerParam
;
import
com.clx.performance.service.TransportSyncService
;
import
com.clx.performance.service.TransportSyncService
;
import
com.clx.performance.service.settle.OrderChildSyncTransportRecordService
;
import
com.clx.performance.service.settle.OrderChildSyncTransportRecordService
;
import
com.clx.performance.service.settle.SettlementOwnerService
;
import
com.msl.common.dto.HttpDTO
;
import
com.msl.common.dto.HttpDTO
;
import
com.msl.common.result.Result
;
import
com.msl.common.result.Result
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.Api
;
...
@@ -51,9 +52,10 @@ public class TransportSyncController {
...
@@ -51,9 +52,10 @@ public class TransportSyncController {
private
final
SettlementDriverDetailDao
settlementDriverDetailDao
;
private
final
SettlementDriverDetailDao
settlementDriverDetailDao
;
private
final
OrderChildSyncTransportRecordService
orderChildSyncTransportRecordService
;
private
final
OrderChildSyncTransportRecordService
orderChildSyncTransportRecordService
;
private
final
SettlementOwnerService
settlementOwnerService
;
/**
/**
* 支付结果
* 支付结果
* @param param
* @param param
...
@@ -81,11 +83,11 @@ public class TransportSyncController {
...
@@ -81,11 +83,11 @@ public class TransportSyncController {
@PostMapping
(
"/invoicingStatusNotify"
)
@PostMapping
(
"/invoicingStatusNotify"
)
public
Object
invoicingStatusNotify
(
@RequestBody
String
param
)
{
public
Object
invoicingStatusNotify
(
@RequestBody
String
param
)
{
HttpDTO
bean
=
JSONUtil
.
toBean
(
param
,
HttpDTO
.
class
);
HttpDTO
bean
=
JSONUtil
.
toBean
(
param
,
HttpDTO
.
class
);
log
.
info
(
"
pay
StatusNotify 原始报文:{}"
,
bean
);
log
.
info
(
"
invoicing
StatusNotify 原始报文:{}"
,
bean
);
String
decrypt
=
ThirdComponent
.
decrypt
(
bean
.
getData
());
String
decrypt
=
ThirdComponent
.
decrypt
(
bean
.
getData
());
log
.
info
(
"
pay
StatusNotify 解密后:{}"
,
decrypt
);
log
.
info
(
"
invoicing
StatusNotify 解密后:{}"
,
decrypt
);
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
=
JSONUtil
.
toBean
(
decrypt
,
InvoicingStatusNotifyDTO
.
class
);
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
=
JSONUtil
.
toBean
(
decrypt
,
InvoicingStatusNotifyDTO
.
class
);
// orderChildSyncTransportRecordService.updateStatus(pay
StatusNotifyDTO);
settlementOwnerService
.
invoicingStatusNotify
(
invoicing
StatusNotifyDTO
);
return
ThirdComponent
.
encrypt
(
JSON
.
toJSONString
(
Result
.
ok
()));
return
ThirdComponent
.
encrypt
(
JSON
.
toJSONString
(
Result
.
ok
()));
}
}
...
...
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @
48d0c0ec
package
com
.
clx
.
performance
.
service
.
impl
.
settle
;
package
com
.
clx
.
performance
.
service
.
impl
.
settle
;
import
cn.hutool.core.collection.CollectionUtil
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.clx.performance.component.ThirdComponent
;
import
com.clx.performance.component.ThirdComponent
;
...
@@ -7,6 +8,7 @@ import com.clx.performance.dao.settle.SettlementLogDao;
...
@@ -7,6 +8,7 @@ import com.clx.performance.dao.settle.SettlementLogDao;
import
com.clx.performance.dao.settle.SettlementOwnerDao
;
import
com.clx.performance.dao.settle.SettlementOwnerDao
;
import
com.clx.performance.dao.settle.SettlementOwnerDetailDao
;
import
com.clx.performance.dao.settle.SettlementOwnerDetailDao
;
import
com.clx.performance.dao.settle.SettlementPlatformAccountDao
;
import
com.clx.performance.dao.settle.SettlementPlatformAccountDao
;
import
com.clx.performance.dto.InvoicingStatusNotifyDTO
;
import
com.clx.performance.enums.OrderChildLogEnum
;
import
com.clx.performance.enums.OrderChildLogEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.settle.SettlementLogEnum
;
import
com.clx.performance.enums.settle.SettlementLogEnum
;
...
@@ -518,5 +520,19 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
...
@@ -518,5 +520,19 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
}
}
}
}
@Override
public
void
invoicingStatusNotify
(
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
)
{
List
<
String
>
childNoList
=
invoicingStatusNotifyDTO
.
getChildNoList
();
if
(
CollectionUtil
.
isEmpty
(
childNoList
))
{
return
;
}
SettlementOwnerDetail
settlementOwnerDetail
=
settlementOwnerDetailDao
.
getByChildNo
(
childNoList
.
get
(
0
)).
get
();
String
settlementNo
=
settlementOwnerDetail
.
getSettlementNo
();
List
<
SettlementOwnerDetail
>
list
=
settlementOwnerDetailDao
.
getBySettlementNo
(
settlementNo
);
for
(
SettlementOwnerDetail
ownerDetail
:
list
)
{
}
}
}
}
performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java
浏览文件 @
48d0c0ec
package
com
.
clx
.
performance
.
service
.
settle
;
package
com
.
clx
.
performance
.
service
.
settle
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.clx.performance.dto.InvoicingStatusNotifyDTO
;
import
com.clx.performance.param.pc.owner.*
;
import
com.clx.performance.param.pc.owner.*
;
import
com.clx.performance.vo.pc.carrier.settle.*
;
import
com.clx.performance.vo.pc.carrier.settle.*
;
import
com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO
;
import
com.clx.performance.vo.pc.owner.settle.OwnerPageSettlementOwnerVO
;
...
@@ -52,5 +53,5 @@ public interface SettlementOwnerService {
...
@@ -52,5 +53,5 @@ public interface SettlementOwnerService {
void
payeeConfirm
(
String
settlementNo
);
void
payeeConfirm
(
String
settlementNo
);
void
invoicingStatusNotify
(
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
);
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论