Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cash-loan-flow-boss
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
QG
cash-loan-flow-boss
Commits
7cca64c0
Commit
7cca64c0
authored
Jun 01, 2020
by
王向伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Feign 使用String 接收
parent
def37ade
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
25 deletions
+20
-25
MoOrderServiceImpl.java
...ashloanflowboss/api/order/service/MoOrderServiceImpl.java
+4
-6
KoalaCenter.java
...tgroup/cashloanflowboss/spi/koala/client/KoalaCenter.java
+6
-6
KoalaCenterService.java
...ashloanflowboss/spi/koala/service/KoalaCenterService.java
+7
-4
JsonResult.java
.../cn/quantgroup/cashloanflowboss/spi/model/JsonResult.java
+3
-9
No files found.
src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/MoOrderServiceImpl.java
View file @
7cca64c0
...
...
@@ -165,14 +165,12 @@ public class MoOrderServiceImpl implements OrderService{
ServiceResult
<
XyqbCurrentOrderStatusServiceResultModel
>
orderStatusResult
=
xyqbCenterService
.
getXyqbOrderStatus
(
it
.
getApplyNo
(),
it
.
getLoanId
());
if
(
Objects
.
nonNull
(
orderStatusResult
)
&&
orderStatusResult
.
isSuccess
()){
xyqbCenterServiceXyqbOrderStatus
=
JsonResult
.
buildSuccess
(
"success"
,
orderStatusResult
.
getData
());
xyqbCenterServiceXyqbOrderStatus
.
setSuccess
(
true
);
}
else
{
xyqbCenterServiceXyqbOrderStatus
=
JsonResult
.
buildError
(
"success"
,
null
);
xyqbCenterServiceXyqbOrderStatus
.
setSuccess
(
false
);
}
}
log
.
info
(
"[xyqbCenterService.getXyqbOrderStatus]xyqbOrderStatus={}"
,
JSONTools
.
serialize
(
xyqbCenterServiceXyqbOrderStatus
));
if
(
xyqbCenterServiceXyqbOrderStatus
.
get
Success
())
{
if
(
xyqbCenterServiceXyqbOrderStatus
.
is
Success
())
{
QueryXyqbOrderStatus
currentStatus
=
xyqbCenterServiceXyqbOrderStatus
.
getData
().
getCurrentStatus
();
Tuple
<
String
,
List
<
OrderVo
.
OptButton
>>
currentStatusAndButtons
=
this
.
getCurrentStatusAndButtons
(
currentStatus
,
it
);
...
...
@@ -418,7 +416,7 @@ public class MoOrderServiceImpl implements OrderService{
}
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>
xyqbOrderHistoryStatusResult
=
koalaCenterService
.
getOrderHistoryStatus
(
orderMapping
.
getApplyNo
(),
orderMapping
.
getLoanId
());
if
(
xyqbOrderHistoryStatusResult
.
get
Success
())
{
if
(
xyqbOrderHistoryStatusResult
.
is
Success
())
{
log
.
info
(
"[getOrderHistoryStatus]查询成功channelOrderNumber={}, xyqbOrderHistoryStatusResult={}"
,
channelOrderNumber
,
JSONTools
.
serialize
(
xyqbOrderHistoryStatusResult
));
XyqbHistoryOrderStatusServiceResultModel
data
=
xyqbOrderHistoryStatusResult
.
getData
();
List
<
VoOrderStatus
>
historyStatusList
=
new
ArrayList
<>();
...
...
@@ -859,8 +857,8 @@ public class MoOrderServiceImpl implements OrderService{
TypeReference
<
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>>
typeToken
=
new
TypeReference
<
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>>()
{
};
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>
xyqbHistoryOrderStatusServiceResultModelJsonResult
=
JSONObject
.
parseObject
(
result
,
typeToken
);
boolean
success
=
xyqbHistoryOrderStatusServiceResultModelJsonResult
.
getSuccess
();
System
.
out
.
println
(
success
);
}
...
...
src/main/java/cn/quantgroup/cashloanflowboss/spi/koala/client/KoalaCenter.java
View file @
7cca64c0
...
...
@@ -82,11 +82,12 @@ public interface KoalaCenter {
* @return
*/
@PostMapping
(
value
=
"/v1/order/query/status"
,
consumes
=
"application/x-www-form-urlencoded"
)
JsonResult
<
XyqbCurrentOrderStatusServiceResultModel
>
getOrderStatus
(
@RequestParam
Map
paramMap
);
String
getOrderStatus
(
@RequestParam
Map
paramMap
);
//用String不用JsonResult 是因为 字段首个字母大写时 会有问题
@PostMapping
(
value
=
"/v1/order/query/status/history"
,
consumes
=
"application/x-www-form-urlencoded"
)
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>
getOrderHistoryStatus
(
@RequestParam
Map
paramMap
);
String
getOrderHistoryStatus
(
@RequestParam
Map
paramMap
);
@Component
class
Fallback
implements
KoalaCenter
{
...
...
@@ -124,14 +125,13 @@ public interface KoalaCenter {
}
@Override
public
JsonResult
<
XyqbCurrentOrderStatusServiceResultModel
>
getOrderStatus
(
Map
paramMap
)
{
public
String
getOrderStatus
(
Map
paramMap
)
{
JsonResult
jsonResult
=
JsonResult
.
buildError
(
"查询出错"
);
jsonResult
.
setSuccess
(
false
);
return
jsonResult
;
return
jsonResult
.
toString
();
}
@Override
public
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>
getOrderHistoryStatus
(
Map
paramMap
)
{
public
String
getOrderHistoryStatus
(
Map
paramMap
)
{
return
null
;
}
}
...
...
src/main/java/cn/quantgroup/cashloanflowboss/spi/koala/service/KoalaCenterService.java
View file @
7cca64c0
...
...
@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.spi.model.JsonResult;
import
cn.quantgroup.cashloanflowboss.spi.xyqb.util.SignUtil
;
import
cn.quantgroup.cashloanflowboss.utils.JSONTools
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.TypeReference
;
import
com.google.common.collect.Maps
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -146,11 +147,12 @@ public class KoalaCenterService {
paramMap
=
SignUtil
.
sign
(
SignUtil
.
KA_API_KEY
,
paramMap
);
JsonResult
<
XyqbCurrentOrderStatusServiceResultModel
>
orderStatus
;
try
{
orderStatus
=
koalaCenter
.
getOrderStatus
(
paramMap
);
String
result
=
koalaCenter
.
getOrderStatus
(
paramMap
);
TypeReference
<
JsonResult
<
XyqbCurrentOrderStatusServiceResultModel
>>
type
=
new
TypeReference
<
JsonResult
<
XyqbCurrentOrderStatusServiceResultModel
>>(){};
orderStatus
=
JSONObject
.
parseObject
(
result
,
type
);
}
catch
(
Exception
e
)
{
log
.
error
(
"获取状态出错"
,
e
);
orderStatus
=
JsonResult
.
buildError
(
"远程错误"
);
orderStatus
.
setSuccess
(
false
);
}
log
.
info
(
"[getOrderStatus]koala订单状态查询,creditOrderNumber={},result={}"
,
creditOrderNumber
,
JSONTools
.
serialize
(
orderStatus
));
return
orderStatus
;
...
...
@@ -166,11 +168,12 @@ public class KoalaCenterService {
paramMap
=
SignUtil
.
sign
(
SignUtil
.
KA_API_KEY
,
paramMap
);
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>
orderHistoryStatus
=
null
;
try
{
orderHistoryStatus
=
koalaCenter
.
getOrderHistoryStatus
(
paramMap
);
String
result
=
koalaCenter
.
getOrderHistoryStatus
(
paramMap
);
TypeReference
<
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>>
typeReference
=
new
TypeReference
<
JsonResult
<
XyqbHistoryOrderStatusServiceResultModel
>>(){};
orderHistoryStatus
=
JSONObject
.
parseObject
(
result
,
typeReference
);
}
catch
(
Exception
e
)
{
log
.
error
(
"远程错误"
,
e
);
orderHistoryStatus
=
JsonResult
.
buildError
(
"远程错误"
);
orderHistoryStatus
.
setSuccess
(
false
);
}
return
orderHistoryStatus
;
...
...
src/main/java/cn/quantgroup/cashloanflowboss/spi/model/JsonResult.java
View file @
7cca64c0
...
...
@@ -33,7 +33,7 @@ public class JsonResult<T> implements Serializable {
private
T
data
=
null
;
private
Boolean
success
;
public
JsonResult
(
String
msg
,
Long
code
,
T
data
)
{
...
...
@@ -49,13 +49,7 @@ public class JsonResult<T> implements Serializable {
this
.
businessCode
=
String
.
format
(
ZERO_FILL_TEMPLATE
,
businessCode
);
}
public
JsonResult
(
String
msg
,
Long
code
,
T
data
,
Long
businessCode
,
Boolean
success
)
{
this
.
msg
=
msg
;
this
.
code
=
String
.
format
(
ZERO_FILL_TEMPLATE
,
code
);
this
.
data
=
data
;
this
.
businessCode
=
String
.
format
(
ZERO_FILL_TEMPLATE
,
businessCode
);
this
.
success
=
success
;
}
/**
* 构造成功的JsonResult
...
...
@@ -120,6 +114,6 @@ public class JsonResult<T> implements Serializable {
String
result
=
"{\"msg\":\"远程服务错误(403,参数错误申请单已到终态)\",\"code\":\"0800\",\"businessCode\":\"0800\",\"success\":false}"
;
JsonResult
jsonObject
=
JSONObject
.
parseObject
(
result
,
JsonResult
.
class
);
Boolean
success
=
jsonObject
.
getSuccess
();
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment