Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
clx-performance
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
姜武杰
clx-performance
Commits
b15abb23
提交
b15abb23
authored
1月 03, 2024
作者:
aiqingguo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
承运同步-参数、返回值使用对象
上级
026962a8
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
78 行增加
和
17 行删除
+78
-17
ThirdOrderChildInvoiceStatusDTO.java
...aram/feign/transport/ThirdOrderChildInvoiceStatusDTO.java
+18
-0
ThirdOrderChildInvoiceStatusParam.java
...am/feign/transport/ThirdOrderChildInvoiceStatusParam.java
+21
-0
ThirdOrderChildRiskStatusDTO.java
...e/param/feign/transport/ThirdOrderChildRiskStatusDTO.java
+25
-0
ThirdOrderChildRiskStatusParam.java
...param/feign/transport/ThirdOrderChildRiskStatusParam.java
+3
-7
TransportSyncController.java
...ance/controller/pc/transport/TransportSyncController.java
+2
-2
TempController.java
...a/com/clx/performance/controller/temp/TempController.java
+4
-2
TransportFeignService.java
...java/com/clx/performance/feign/TransportFeignService.java
+5
-6
没有找到文件。
performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildInvoiceStatusDTO.java
0 → 100644
浏览文件 @
b15abb23
package
com
.
clx
.
performance
.
param
.
feign
.
transport
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
@Getter
@Setter
@ToString
@NoArgsConstructor
public
class
ThirdOrderChildInvoiceStatusDTO
{
@ApiModelProperty
(
value
=
"开票状态:0未开票 1已开票 2运单不存在"
)
private
Integer
status
;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildInvoiceStatusParam.java
0 → 100644
浏览文件 @
b15abb23
package
com
.
clx
.
performance
.
param
.
feign
.
transport
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
import
javax.validation.constraints.NotBlank
;
@Getter
@Setter
@ToString
@NoArgsConstructor
public
class
ThirdOrderChildInvoiceStatusParam
{
@ApiModelProperty
(
value
=
"运单编号"
)
@NotBlank
(
message
=
"运单编号不能为空"
)
private
String
childNo
;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildRiskStatusDTO.java
0 → 100644
浏览文件 @
b15abb23
package
com
.
clx
.
performance
.
param
.
feign
.
transport
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Getter
;
import
lombok.NoArgsConstructor
;
import
lombok.Setter
;
import
lombok.ToString
;
@Getter
@Setter
@ToString
@NoArgsConstructor
public
class
ThirdOrderChildRiskStatusDTO
{
@ApiModelProperty
(
value
=
"运单编号"
)
private
String
childNo
;
@ApiModelProperty
(
value
=
"合规状态:0不合规 1合规 2未同步 "
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"风控原因"
)
private
String
riskReason
;
}
performance-api/src/main/java/com/clx/performance/param/feign/transport/ThirdOrderChildRiskStatusParam.java
浏览文件 @
b15abb23
...
@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
...
@@ -6,6 +6,8 @@ import lombok.NoArgsConstructor;
import
lombok.Setter
;
import
lombok.Setter
;
import
lombok.ToString
;
import
lombok.ToString
;
import
javax.validation.constraints.NotBlank
;
@Getter
@Getter
@Setter
@Setter
@ToString
@ToString
...
@@ -13,13 +15,7 @@ import lombok.ToString;
...
@@ -13,13 +15,7 @@ import lombok.ToString;
public
class
ThirdOrderChildRiskStatusParam
{
public
class
ThirdOrderChildRiskStatusParam
{
@ApiModelProperty
(
value
=
"运单编号"
)
@ApiModelProperty
(
value
=
"运单编号"
)
@NotBlank
(
message
=
"运单编号不能为空"
)
private
String
childNo
;
private
String
childNo
;
@ApiModelProperty
(
value
=
"合规状态:0不合规 1合规 2未同步 "
)
private
Integer
status
;
@ApiModelProperty
(
value
=
"风控原因"
)
private
String
riskReason
;
}
}
performance-web/src/main/java/com/clx/performance/controller/pc/transport/TransportSyncController.java
浏览文件 @
b15abb23
...
@@ -18,7 +18,7 @@ import com.clx.performance.model.OrderGoods;
...
@@ -18,7 +18,7 @@ import com.clx.performance.model.OrderGoods;
import
com.clx.performance.model.settle.SettlementDriverDetail
;
import
com.clx.performance.model.settle.SettlementDriverDetail
;
import
com.clx.performance.model.settle.SettlementOwnerDetail
;
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.param.feign.transport.ThirdOrderChildRiskStatus
Param
;
import
com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatus
DTO
;
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.clx.performance.service.settle.SettlementOwnerService
;
...
@@ -103,7 +103,7 @@ public class TransportSyncController {
...
@@ -103,7 +103,7 @@ public class TransportSyncController {
log
.
info
(
"riskStatusNotify 原始报文:{}"
,
bean
);
log
.
info
(
"riskStatusNotify 原始报文:{}"
,
bean
);
String
decrypt
=
ThirdComponent
.
decrypt
(
bean
.
getData
());
String
decrypt
=
ThirdComponent
.
decrypt
(
bean
.
getData
());
log
.
info
(
"riskStatusNotify 解密后:{}"
,
decrypt
);
log
.
info
(
"riskStatusNotify 解密后:{}"
,
decrypt
);
ThirdOrderChildRiskStatus
Param
invoicingStatusNotifyDTO
=
JSONUtil
.
toBean
(
decrypt
,
ThirdOrderChildRiskStatusParam
.
class
);
ThirdOrderChildRiskStatus
DTO
invoicingStatusNotifyDTO
=
JSONUtil
.
toBean
(
decrypt
,
ThirdOrderChildRiskStatusDTO
.
class
);
return
ThirdComponent
.
encrypt
(
JSON
.
toJSONString
(
Result
.
ok
()));
return
ThirdComponent
.
encrypt
(
JSON
.
toJSONString
(
Result
.
ok
()));
}
}
...
...
performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
浏览文件 @
b15abb23
...
@@ -5,6 +5,7 @@ import com.clx.performance.extranal.transport.TransportService;
...
@@ -5,6 +5,7 @@ import com.clx.performance.extranal.transport.TransportService;
import
com.clx.performance.feign.TransportFeignService
;
import
com.clx.performance.feign.TransportFeignService
;
import
com.clx.performance.param.feign.transport.OrderChildPaySyncParam
;
import
com.clx.performance.param.feign.transport.OrderChildPaySyncParam
;
import
com.clx.performance.param.feign.transport.OwnerSettlementSyncParam
;
import
com.clx.performance.param.feign.transport.OwnerSettlementSyncParam
;
import
com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam
;
import
com.clx.performance.service.TempService
;
import
com.clx.performance.service.TempService
;
import
com.clx.performance.service.child.FeignOrderChildService
;
import
com.clx.performance.service.child.FeignOrderChildService
;
import
com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO
;
import
com.clx.performance.vo.pc.child.OrderChildLineStatisticsVO
;
...
@@ -112,8 +113,9 @@ public class TempController {
...
@@ -112,8 +113,9 @@ public class TempController {
@ApiOperation
(
value
=
"获取风控状态 (临时接口)"
,
notes
=
"<br>By:艾庆国"
)
@ApiOperation
(
value
=
"获取风控状态 (临时接口)"
,
notes
=
"<br>By:艾庆国"
)
@RequestMapping
(
value
=
"/getRiskStatus"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/getRiskStatus"
,
method
=
RequestMethod
.
POST
)
public
Result
<
Void
>
getRiskStatus
(
String
childNo
)
{
public
Result
<
Void
>
getRiskStatus
(
String
childNo
)
{
ThirdOrderChildRiskStatusParam
param
=
new
ThirdOrderChildRiskStatusParam
();
HttpDTO
httpDTO
=
transportFeignService
.
getRiskStatus
(
childNo
);
param
.
setChildNo
(
childNo
);
HttpDTO
httpDTO
=
transportFeignService
.
getRiskStatus
(
param
);
String
decrypt
=
ThirdComponent
.
decrypt
(
httpDTO
.
getData
());
String
decrypt
=
ThirdComponent
.
decrypt
(
httpDTO
.
getData
());
log
.
info
(
"{}"
,
decrypt
);
log
.
info
(
"{}"
,
decrypt
);
return
Result
.
ok
();
return
Result
.
ok
();
...
...
performance-web/src/main/java/com/clx/performance/feign/TransportFeignService.java
浏览文件 @
b15abb23
...
@@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
...
@@ -10,8 +10,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotBlank
;
import
javax.validation.constraints.NotEmpty
;
import
java.util.List
;
@FeignClient
(
name
=
"transport-service-yitu"
,
url
=
"${transport-service.host}"
,
configuration
=
FeignInterceptor
.
class
)
@FeignClient
(
name
=
"transport-service-yitu"
,
url
=
"${transport-service.host}"
,
configuration
=
FeignInterceptor
.
class
)
public
interface
TransportFeignService
{
public
interface
TransportFeignService
{
...
@@ -25,10 +23,10 @@ public interface TransportFeignService {
...
@@ -25,10 +23,10 @@ public interface TransportFeignService {
/**
/**
* 获取风控状态
* 获取风控状态
* @return
* @return
* @see
com.clx.performance.param.feign.transport.ThirdOrderChildRiskStatusParam
* @see
ThirdOrderChildRiskStatusDTO
*/
*/
@RequestMapping
(
value
=
"/transport-service/thirdParty/order/getRiskStatus"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/transport-service/thirdParty/order/getRiskStatus"
,
method
=
RequestMethod
.
POST
)
HttpDTO
getRiskStatus
(
@RequestBody
@NotBlank
(
message
=
"运单编号不能为空"
)
String
childNo
);
HttpDTO
getRiskStatus
(
@RequestBody
ThirdOrderChildRiskStatusParam
param
);
/**
/**
* 运单支付运费同步
* 运单支付运费同步
...
@@ -38,10 +36,11 @@ public interface TransportFeignService {
...
@@ -38,10 +36,11 @@ public interface TransportFeignService {
/**
/**
* 获取运单开票状态
* 获取运单开票状态
* @return 0-未申请,10-已申请,20-审核失败,30-已开票
* @return
* @see ThirdOrderChildInvoiceStatusDTO
*/
*/
@RequestMapping
(
value
=
"/transport-service/thirdParty/order/getInvoiceStatus"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/transport-service/thirdParty/order/getInvoiceStatus"
,
method
=
RequestMethod
.
POST
)
Result
<
Integer
>
getInvoiceStatus
(
@RequestBody
@NotBlank
(
message
=
"运单编号不能为空"
)
String
childNo
);
HttpDTO
getInvoiceStatus
(
@RequestBody
ThirdOrderChildInvoiceStatusParam
param
);
/**
/**
* 货主结算单同步 (只推同一货主)
* 货主结算单同步 (只推同一货主)
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论