Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
78693059
提交
78693059
authored
12月 13, 2023
作者:
huyufan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
开票通知
上级
48d0c0ec
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
30 行增加
和
8 行删除
+30
-8
SettlementOwnerDetailDaoImpl.java
...ormance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java
+16
-0
SettlementOwnerDetailDao.java
.../clx/performance/dao/settle/SettlementOwnerDetailDao.java
+5
-0
SettlementOwnerServiceImpl.java
...mance/service/impl/settle/SettlementOwnerServiceImpl.java
+9
-8
没有找到文件。
performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java
浏览文件 @
78693059
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.dao.settle.SettlementOwnerDetailDao
;
import
com.clx.performance.dao.settle.SettlementOwnerDetailDao
;
import
com.clx.performance.enums.settle.SettlementOwnerEnum
;
import
com.clx.performance.mapper.settle.SettlementOwnerDetailMapper
;
import
com.clx.performance.mapper.settle.SettlementOwnerDetailMapper
;
import
com.clx.performance.model.settle.SettlementOwnerDetail
;
import
com.clx.performance.model.settle.SettlementOwnerDetail
;
import
com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam
;
import
com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerDetailParam
;
...
@@ -74,6 +75,13 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
...
@@ -74,6 +75,13 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
return
list
(
lQrWrapper
().
eq
(
SettlementOwnerDetail:
:
getSettlementNo
,
settlementNo
));
return
list
(
lQrWrapper
().
eq
(
SettlementOwnerDetail:
:
getSettlementNo
,
settlementNo
));
}
}
@Override
public
List
<
SettlementOwnerDetail
>
getBySettlementNoAndInvoiceType
(
String
settlementNo
,
Integer
invoiceType
)
{
return
list
(
lQrWrapper
().
eq
(
SettlementOwnerDetail:
:
getSettlementNo
,
settlementNo
)
.
eq
(
SettlementOwnerDetail:
:
getInvoiceType
,
invoiceType
)
);
}
@Override
@Override
public
IPage
<
SettlementOwnerDetail
>
pageSettlementOwnerDetail
(
public
IPage
<
SettlementOwnerDetail
>
pageSettlementOwnerDetail
(
...
@@ -100,6 +108,14 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
...
@@ -100,6 +108,14 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
return
baseMapper
.
getInvoiceType
(
orderNo
);
return
baseMapper
.
getInvoiceType
(
orderNo
);
}
}
@Override
public
void
updateSettlementByChildNoList
(
List
<
String
>
childNoList
)
{
update
(
lUdWrapper
()
.
in
(
SettlementOwnerDetail:
:
getChildNo
,
childNoList
)
.
set
(
SettlementOwnerDetail:
:
getInvoiceStatus
,
SettlementOwnerEnum
.
InvoiceStatus
.
INVOICED
.
getCode
())
);
}
@Override
@Override
public
IPage
<
SettlementOwnerDetail
>
pageOwnerSettlementOrderDetailList
(
PageOwnerSettlementOwnerDetailParam
param
)
{
public
IPage
<
SettlementOwnerDetail
>
pageOwnerSettlementOrderDetailList
(
PageOwnerSettlementOwnerDetailParam
param
)
{
LambdaQueryWrapper
<
SettlementOwnerDetail
>
query
=
new
LambdaQueryWrapper
<>();
LambdaQueryWrapper
<
SettlementOwnerDetail
>
query
=
new
LambdaQueryWrapper
<>();
...
...
performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java
浏览文件 @
78693059
...
@@ -30,9 +30,14 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
...
@@ -30,9 +30,14 @@ public interface SettlementOwnerDetailDao extends BaseDao<SettlementOwnerDetailM
Optional
<
SettlementOwnerDetail
>
getByChildNo
(
String
childNo
);
Optional
<
SettlementOwnerDetail
>
getByChildNo
(
String
childNo
);
List
<
SettlementOwnerDetail
>
getBySettlementNo
(
String
settlementNo
);
List
<
SettlementOwnerDetail
>
getBySettlementNo
(
String
settlementNo
);
List
<
SettlementOwnerDetail
>
getBySettlementNoAndInvoiceType
(
String
settlementNo
,
Integer
invoiceType
);
IPage
<
SettlementOwnerDetail
>
pageOwnerSettlementOrderDetailList
(
PageOwnerSettlementOwnerDetailParam
param
);
IPage
<
SettlementOwnerDetail
>
pageOwnerSettlementOrderDetailList
(
PageOwnerSettlementOwnerDetailParam
param
);
IPage
<
SettlementOwnerDetail
>
pageSettlementOwnerDetail
(
PageCarrierSettlementOwnerDetailParam
param
);
IPage
<
SettlementOwnerDetail
>
pageSettlementOwnerDetail
(
PageCarrierSettlementOwnerDetailParam
param
);
Integer
getInvoiceType
(
String
orderNo
);
Integer
getInvoiceType
(
String
orderNo
);
void
updateSettlementByChildNoList
(
List
<
String
>
childNoList
);
}
}
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @
78693059
...
@@ -11,10 +11,7 @@ import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
...
@@ -11,10 +11,7 @@ import com.clx.performance.dao.settle.SettlementPlatformAccountDao;
import
com.clx.performance.dto.InvoicingStatusNotifyDTO
;
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.*
;
import
com.clx.performance.enums.settle.SettlementOwnerDetailEnum
;
import
com.clx.performance.enums.settle.SettlementOwnerEnum
;
import
com.clx.performance.enums.settle.SettlementWayEnum
;
import
com.clx.performance.feign.TransportFeignService
;
import
com.clx.performance.feign.TransportFeignService
;
import
com.clx.performance.model.settle.SettlementLog
;
import
com.clx.performance.model.settle.SettlementLog
;
import
com.clx.performance.model.settle.SettlementOwner
;
import
com.clx.performance.model.settle.SettlementOwner
;
...
@@ -489,7 +486,8 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
...
@@ -489,7 +486,8 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
param
.
setOwnerMobile
(
mobile
);
param
.
setOwnerMobile
(
mobile
);
List
<
OwnerSettlementSyncParam
.
SettlementItem
>
settlementList
=
new
LinkedList
<>();
List
<
OwnerSettlementSyncParam
.
SettlementItem
>
settlementList
=
new
LinkedList
<>();
param
.
setSettlementList
(
settlementList
);
param
.
setSettlementList
(
settlementList
);
List
<
SettlementOwnerDetail
>
settlementOwnerDetailList
=
settlementOwnerDetailDao
.
getBySettlementNo
(
settlementNo
);
List
<
SettlementOwnerDetail
>
settlementOwnerDetailList
=
settlementOwnerDetailDao
.
getBySettlementNoAndInvoiceType
(
settlementNo
,
SettlementDriverEnum
.
InvoiceType
.
ONLINE
.
getCode
());
for
(
SettlementOwnerDetail
settlementOwnerDetail
:
settlementOwnerDetailList
)
{
for
(
SettlementOwnerDetail
settlementOwnerDetail
:
settlementOwnerDetailList
)
{
String
childNo
=
settlementOwnerDetail
.
getChildNo
();
String
childNo
=
settlementOwnerDetail
.
getChildNo
();
OwnerSettlementSyncParam
.
SettlementItem
item
=
new
OwnerSettlementSyncParam
.
SettlementItem
();
OwnerSettlementSyncParam
.
SettlementItem
item
=
new
OwnerSettlementSyncParam
.
SettlementItem
();
...
@@ -521,6 +519,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
...
@@ -521,6 +519,7 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
}
}
@Override
@Override
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
void
invoicingStatusNotify
(
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
)
{
public
void
invoicingStatusNotify
(
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
)
{
List
<
String
>
childNoList
=
invoicingStatusNotifyDTO
.
getChildNoList
();
List
<
String
>
childNoList
=
invoicingStatusNotifyDTO
.
getChildNoList
();
if
(
CollectionUtil
.
isEmpty
(
childNoList
))
{
if
(
CollectionUtil
.
isEmpty
(
childNoList
))
{
...
@@ -528,10 +527,12 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
...
@@ -528,10 +527,12 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
}
}
SettlementOwnerDetail
settlementOwnerDetail
=
settlementOwnerDetailDao
.
getByChildNo
(
childNoList
.
get
(
0
)).
get
();
SettlementOwnerDetail
settlementOwnerDetail
=
settlementOwnerDetailDao
.
getByChildNo
(
childNoList
.
get
(
0
)).
get
();
String
settlementNo
=
settlementOwnerDetail
.
getSettlementNo
();
String
settlementNo
=
settlementOwnerDetail
.
getSettlementNo
();
List
<
SettlementOwnerDetail
>
list
=
settlementOwnerDetailDao
.
getBySettlementNo
(
settlementNo
);
List
<
SettlementOwnerDetail
>
list
=
settlementOwnerDetailDao
.
getBySettlementNoAndInvoiceType
(
settlementNo
,
for
(
SettlementOwnerDetail
ownerDetail
:
list
)
{
SettlementOwnerEnum
.
InvoiceType
.
ONLINE
.
getCode
()
);
settlementOwnerDetailDao
.
updateSettlementByChildNoList
(
childNoList
);
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论