Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
e86e9e34
提交
e86e9e34
authored
12月 12, 2023
作者:
aiqingguo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
承运同步
上级
548f46fb
显示空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
16 行增加
和
3 行删除
+16
-3
TransportSyncController.java
...ance/controller/pc/transport/TransportSyncController.java
+2
-1
InvoicingStatusNotifyDTO.java
...ava/com/clx/performance/dto/InvoicingStatusNotifyDTO.java
+12
-0
TransportSyncServiceImpl.java
...lx/performance/service/impl/TransportSyncServiceImpl.java
+2
-2
没有找到文件。
performance-web/src/main/java/com/clx/performance/controller/pc/transport/TransportSyncController.java
浏览文件 @
e86e9e34
...
@@ -8,6 +8,7 @@ import com.clx.performance.dao.OrderChildDao;
...
@@ -8,6 +8,7 @@ import com.clx.performance.dao.OrderChildDao;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.OrderGoodsDao
;
import
com.clx.performance.dao.settle.SettlementDriverDetailDao
;
import
com.clx.performance.dao.settle.SettlementDriverDetailDao
;
import
com.clx.performance.dao.settle.SettlementOwnerDetailDao
;
import
com.clx.performance.dao.settle.SettlementOwnerDetailDao
;
import
com.clx.performance.dto.InvoicingStatusNotifyDTO
;
import
com.clx.performance.dto.OrderChildSyncDTO
;
import
com.clx.performance.dto.OrderChildSyncDTO
;
import
com.clx.performance.dto.PayStatusNotifyDTO
;
import
com.clx.performance.dto.PayStatusNotifyDTO
;
import
com.clx.performance.enums.PerformanceResultEnum
;
import
com.clx.performance.enums.PerformanceResultEnum
;
...
@@ -82,7 +83,7 @@ public class TransportSyncController {
...
@@ -82,7 +83,7 @@ public class TransportSyncController {
log
.
info
(
"payStatusNotify 原始报文:{}"
,
bean
);
log
.
info
(
"payStatusNotify 原始报文:{}"
,
bean
);
String
decrypt
=
ThirdComponent
.
decrypt
(
bean
.
getData
());
String
decrypt
=
ThirdComponent
.
decrypt
(
bean
.
getData
());
log
.
info
(
"payStatusNotify 解密后:{}"
,
decrypt
);
log
.
info
(
"payStatusNotify 解密后:{}"
,
decrypt
);
// PayStatusNotifyDTO payStatusNotifyDTO = JSONUtil.toBean(decrypt, Pay
StatusNotifyDTO.class);
InvoicingStatusNotifyDTO
invoicingStatusNotifyDTO
=
JSONUtil
.
toBean
(
decrypt
,
Invoicing
StatusNotifyDTO
.
class
);
// orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
// orderChildSyncTransportRecordService.updateStatus(payStatusNotifyDTO);
return
ThirdComponent
.
encrypt
(
JSON
.
toJSONString
(
Result
.
ok
()));
return
ThirdComponent
.
encrypt
(
JSON
.
toJSONString
(
Result
.
ok
()));
}
}
...
...
performance-web/src/main/java/com/clx/performance/dto/InvoicingStatusNotifyDTO.java
0 → 100644
浏览文件 @
e86e9e34
package
com
.
clx
.
performance
.
dto
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
InvoicingStatusNotifyDTO
{
List
<
String
>
childNoList
;
}
performance-web/src/main/java/com/clx/performance/service/impl/TransportSyncServiceImpl.java
浏览文件 @
e86e9e34
...
@@ -104,7 +104,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
...
@@ -104,7 +104,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
param
.
setCreateTime
(
DateUtils
.
formatDateTime
(
orderChild
.
getCreateTime
()).
get
());
param
.
setCreateTime
(
DateUtils
.
formatDateTime
(
orderChild
.
getCreateTime
()).
get
());
param
.
setTruckNo
(
orderChild
.
getTruckNo
());
param
.
setTruckNo
(
orderChild
.
getTruckNo
());
param
.
setFreightPrice
(
Integer
.
valueOf
(
orderChild
.
getFreightPrice
().
toString
()));
param
.
setFreightPrice
(
Integer
.
valueOf
(
orderChild
.
getFreightPrice
().
toString
()));
param
.
setFreight
(
settlementOwnerDetail
.
getFreight
().
intValue
());
param
.
setFreight
(
settlementOwnerDetail
.
getFreight
().
intValue
());
//货主结算金额
param
.
setLoadNet
(
orderChild
.
getLoadNet
());
param
.
setLoadNet
(
orderChild
.
getLoadNet
());
param
.
setNet
(
settlementDriverDetail
.
getWeight
());
param
.
setNet
(
settlementDriverDetail
.
getWeight
());
param
.
setSendAddress
(
orderGoods
.
getSendAddressShorter
());
param
.
setSendAddress
(
orderGoods
.
getSendAddressShorter
());
...
@@ -114,7 +114,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
...
@@ -114,7 +114,7 @@ public class TransportSyncServiceImpl implements TransportSyncService {
param
.
setSendTown
(
sendAddress
.
getTown
());
param
.
setSendTown
(
sendAddress
.
getTown
());
param
.
setSendName
(
sendAddress
.
getContact
());
param
.
setSendName
(
sendAddress
.
getContact
());
param
.
setSendMobile
(
sendAddress
.
getContactPhone
());
param
.
setSendMobile
(
sendAddress
.
getContactPhone
());
param
.
setFreightNoCard
(
settlementDriverDetail
.
getSettlementFreight
().
intValue
());
param
.
setFreightNoCard
(
settlementDriverDetail
.
getSettlementFreight
().
intValue
());
//司机结算金额
param
.
setReceiveAddress
(
receiveAddress
.
getAddress
());
param
.
setReceiveAddress
(
receiveAddress
.
getAddress
());
param
.
setReceiveProvince
(
receiveAddress
.
getProvince
());
param
.
setReceiveProvince
(
receiveAddress
.
getProvince
());
param
.
setReceiveCity
(
receiveAddress
.
getCity
());
param
.
setReceiveCity
(
receiveAddress
.
getCity
());
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论