Skip to content

C
cash-loan-flow-boss
Commit 8a88df58 authored by suntao's avatar suntao
Browse files
Options

推送记录 通知类型 转中文

parent 5634c66d
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 82 deletions
src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java
View file @ 8a88df58
...@@ -4,7 +4,6 @@ import cn.quantgroup.cashloanflowboss.api.optlog.model.OptEnumName; ...@@ -4,7 +4,6 @@ import cn.quantgroup.cashloanflowboss.api.optlog.model.OptEnumName;
import cn.quantgroup.cashloanflowboss.api.optlog.service.OptHistoryLogServiceImpl; import cn.quantgroup.cashloanflowboss.api.optlog.service.OptHistoryLogServiceImpl;
import cn.quantgroup.cashloanflowboss.core.annotation.opt.OperationAnno; import cn.quantgroup.cashloanflowboss.core.annotation.opt.OperationAnno;
import cn.quantgroup.cashloanflowboss.core.base.Tuple; import cn.quantgroup.cashloanflowboss.core.base.Tuple;
import cn.quantgroup.cashloanflowboss.core.tuple.ThreeTuple;
import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackFailRecord; import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackFailRecord;
import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress; import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress;
...@@ -460,7 +459,6 @@ public class OrderServiceImpl implements OrderService{ ...@@ -460,7 +459,6 @@ public class OrderServiceImpl implements OrderService{
if (orderMapping == null) { if (orderMapping == null) {
return historyOrderStatusVoModel; return historyOrderStatusVoModel;
} }
OrderApprove orderApprove = orderApproveRepository.findByCreditNumber(orderMapping.getApplyNo());
ServiceResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = xyqbCenterService.getXyqbOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId()); ServiceResult<XyqbHistoryOrderStatusServiceResultModel> xyqbOrderHistoryStatusResult = xyqbCenterService.getXyqbOrderHistoryStatus(orderMapping.getApplyNo(), orderMapping.getLoanId());
if (xyqbOrderHistoryStatusResult.isSuccess()) { if (xyqbOrderHistoryStatusResult.isSuccess()) {
...@@ -469,7 +467,7 @@ public class OrderServiceImpl implements OrderService{ ...@@ -469,7 +467,7 @@ public class OrderServiceImpl implements OrderService{
List<VoOrderStatus> historyStatusList = new ArrayList<>(); List<VoOrderStatus> historyStatusList = new ArrayList<>();
for (QueryXyqbOrderStatus queryXyqbOrderStatus : data.getHistoryStatus()) { for (QueryXyqbOrderStatus queryXyqbOrderStatus : data.getHistoryStatus()) {
VoOrderStatus voOrderStatus = new VoOrderStatus(); VoOrderStatus voOrderStatus = new VoOrderStatus();
Tuple<String, String> stautsName = OrderUtil.KaNoticeTypeNameConvertChnName(queryXyqbOrderStatus.getStatus(), orderApprove); Tuple<String, String> stautsName = OrderUtil.KaNoticeTypeNameConvertChnName(queryXyqbOrderStatus.getStatus());
voOrderStatus.setStatus(stautsName.getValue()); voOrderStatus.setStatus(stautsName.getValue());
voOrderStatus.setUpdateTime(new Date(queryXyqbOrderStatus.getUpdateTime())); voOrderStatus.setUpdateTime(new Date(queryXyqbOrderStatus.getUpdateTime()));
historyStatusList.add(voOrderStatus); historyStatusList.add(voOrderStatus);
...@@ -584,7 +582,10 @@ public class OrderServiceImpl implements OrderService{ ...@@ -584,7 +582,10 @@ public class OrderServiceImpl implements OrderService{
callbackRecordVoModel.setApplyNo(orderMapping.getApplyNo()); callbackRecordVoModel.setApplyNo(orderMapping.getApplyNo());
callbackRecordVoModel.setLoanId(orderMapping.getLoanId()); callbackRecordVoModel.setLoanId(orderMapping.getLoanId());
callbackRecordVoModel.setTermNo(callbackRecord.getTermNo()); callbackRecordVoModel.setTermNo(callbackRecord.getTermNo());
callbackRecordVoModel.setNoticeType(callbackRecord.getNoticeType());
Tuple<String, String> stringStringTuple = OrderUtil.KaNoticeTypeNameConvertChnName(callbackRecord.getNoticeType());
callbackRecordVoModel.setNoticeType(stringStringTuple != null ? stringStringTuple.getValue() : callbackRecord.getNoticeType().name());
callbackRecordVoModel.setCallbackStatus(callbackRecord.getCallbackStatus()); callbackRecordVoModel.setCallbackStatus(callbackRecord.getCallbackStatus());
callbackRecordVoModel.setChannelId(callbackRecord.getChannelId()); callbackRecordVoModel.setChannelId(callbackRecord.getChannelId());
callbackRecordVoModel.setCreatedAt(callbackRecord.getCreatedAt()); callbackRecordVoModel.setCreatedAt(callbackRecord.getCreatedAt());
...@@ -602,7 +603,10 @@ public class OrderServiceImpl implements OrderService{ ...@@ -602,7 +603,10 @@ public class OrderServiceImpl implements OrderService{
callbackFailRecordVoModel.setApplyNo(orderMapping.getApplyNo()); callbackFailRecordVoModel.setApplyNo(orderMapping.getApplyNo());
callbackFailRecordVoModel.setLoanId(orderMapping.getLoanId()); callbackFailRecordVoModel.setLoanId(orderMapping.getLoanId());
callbackFailRecordVoModel.setTermNo(callbackFailRecord.getTermNo()); callbackFailRecordVoModel.setTermNo(callbackFailRecord.getTermNo());
callbackFailRecordVoModel.setNoticeType(callbackFailRecord.getNoticeType());
Tuple<String, String> stringStringTuple = OrderUtil.KaNoticeTypeNameConvertChnName(callbackFailRecord.getNoticeType());
callbackFailRecordVoModel.setNoticeType(stringStringTuple != null ? stringStringTuple.getValue() : callbackFailRecord.getNoticeType().name());
callbackFailRecordVoModel.setCallbackStatus(callbackFailRecord.getCallbackStatus()); callbackFailRecordVoModel.setCallbackStatus(callbackFailRecord.getCallbackStatus());
callbackFailRecordVoModel.setChannelId(callbackFailRecord.getChannelId()); callbackFailRecordVoModel.setChannelId(callbackFailRecord.getChannelId());
callbackFailRecordVoModel.setRetryTimes(callbackFailRecord.getRetryTimes()); callbackFailRecordVoModel.setRetryTimes(callbackFailRecord.getRetryTimes());
...@@ -717,10 +721,10 @@ public class OrderServiceImpl implements OrderService{ ...@@ -717,10 +721,10 @@ public class OrderServiceImpl implements OrderService{
buttonPaySucc.setAction(OrderVo.OptButtonAction.pay_succ.name()); buttonPaySucc.setAction(OrderVo.OptButtonAction.pay_succ.name());
buttonPaySucc.setName(OrderVo.OptButtonAction.pay_succ.getDesc()); buttonPaySucc.setName(OrderVo.OptButtonAction.pay_succ.getDesc());
buttonList.add(buttonPaySucc); buttonList.add(buttonPaySucc);
OrderVo.OptButton buttonPayFail = new OrderVo.OptButton(); //OrderVo.OptButton buttonPayFail = new OrderVo.OptButton();
buttonPayFail.setAction(OrderVo.OptButtonAction.pay_fail.name()); //buttonPayFail.setAction(OrderVo.OptButtonAction.pay_fail.name());
buttonPayFail.setName(OrderVo.OptButtonAction.pay_fail.getDesc()); //buttonPayFail.setName(OrderVo.OptButtonAction.pay_fail.getDesc());
buttonList.add(buttonPayFail); //buttonList.add(buttonPayFail);
buttonList.add(buttonBeforeCancel); buttonList.add(buttonBeforeCancel);
} }
tuple.setValue(buttonList); tuple.setValue(buttonList);
...@@ -740,22 +744,7 @@ public class OrderServiceImpl implements OrderService{ ...@@ -740,22 +744,7 @@ public class OrderServiceImpl implements OrderService{
tuple.setValue(buttonList); tuple.setValue(buttonList);
return tuple; return tuple;
case "FUND_SUCC" : case "FUND_SUCC" :
OrderApprove orderApprove2 = orderApproveRepository.findByCreditNumber(orderMapping.getApplyNo()); tuple.setKey("放款成功");
if (orderApprove2 != null && orderApprove2.getFundType() != 0) {
// 是存管
tuple.setKey("放款到存管，待存管提现");
OrderVo.OptButton cancelAfterButton = new OrderVo.OptButton();
cancelAfterButton.setAction(OrderVo.OptButtonAction.cancel_after.name());
cancelAfterButton.setName(OrderVo.OptButtonAction.cancel_after.getDesc());
buttonList.add(cancelAfterButton);
OrderVo.OptButton withdrawSecondButton = new OrderVo.OptButton();
withdrawSecondButton.setAction(OrderVo.OptButtonAction.withdraw_second.name());
withdrawSecondButton.setName(OrderVo.OptButtonAction.withdraw_second.getDesc());
buttonList.add(withdrawSecondButton);
} else {
tuple.setKey("放款成功");
}
tuple.setValue(buttonList);
return tuple; return tuple;
case "FUND_WITHDRAW_SUCC" : case "FUND_WITHDRAW_SUCC" :
tuple.setKey("存管提现成功"); tuple.setKey("存管提现成功");
......
src/main/java/cn/quantgroup/cashloanflowboss/api/order/util/OrderUtil.java
View file @ 8a88df58
...@@ -29,50 +29,11 @@ public class OrderUtil { ...@@ -29,50 +29,11 @@ public class OrderUtil {
* @param kaNoticeType * @param kaNoticeType
* @return 状态英文，状态中文 * @return 状态英文，状态中文
*/ */
public static Tuple<String, String> KaNoticeTypeConvertChnName(KANoticeType kaNoticeType, OrderApprove orderApprove) { public static Tuple<String, String> KaNoticeTypeNameConvertChnName(KANoticeType kaNoticeType) {
if (kaNoticeType == null) {
if (kaNoticeType != null) { return new Tuple("", "未知");
switch (kaNoticeType.name()) {
case "CREDIT_SUCC" :
// 授信成功 需要 审批
return new Tuple("CREDIT_SUCC", "授信成功");
case "APPROVE_ING" :
if (orderApprove == null) {
return new Tuple("APPROVE_ING", "授信成功,待审批");
} else {
return new Tuple("APPROVE_ING", "审批中");
}
case "REJECT" :
return new Tuple(kaNoticeType.name(), "审批拒绝");
case "FUAD_ASSIFN_SUCC" :
return new Tuple(kaNoticeType.name(), "审批通过，待提现");
case "WITHDRAW" :
// 提现申请成功 需要放款
return new Tuple(kaNoticeType.name(), "申请提现成功");
case "PAY_ING" :
return new Tuple("PAY_ING", "放款中");
case "FUND_SUCC" :
if (orderApprove != null && orderApprove.getFundType() != 0) {
// 是存管
return new Tuple(kaNoticeType.name(), "放款到存管，待提现");
} else {
return new Tuple(kaNoticeType.name(), "放款成功");
}
case "FUND_WITHDRAW_SUCC" :
return new Tuple(kaNoticeType.name(), "存管提现成功");
case "FUND_FAIL" :
return new Tuple(kaNoticeType.name(), "放款失败");
case "ALL_REPAID" :
return new Tuple(kaNoticeType.name(), "已结清");
case "CANCEL_LOAN" :
return new Tuple(kaNoticeType.name(), "已关单");
case "CANCEL_AFTER_LOAN" :
return new Tuple(kaNoticeType.name(), "存管提现超时或贷后关单");
default:
return new Tuple(kaNoticeType.name(), "未知状态");
}
} }
return new Tuple(kaNoticeType.name(), "未知状态"); return KaNoticeTypeNameConvertChnName(kaNoticeType.name());
} }
/** /**
...@@ -80,26 +41,25 @@ public class OrderUtil { ...@@ -80,26 +41,25 @@ public class OrderUtil {
* @param kaNoticeType * @param kaNoticeType
* @return 状态英文，状态中文 * @return 状态英文，状态中文
*/ */
public static Tuple<String, String> KaNoticeTypeNameConvertChnName(String kaNoticeType, OrderApprove orderApprove) { public static Tuple<String, String> KaNoticeTypeNameConvertChnName(String kaNoticeType) {
if (StringUtils.isNotEmpty(kaNoticeType)) { if (StringUtils.isNotEmpty(kaNoticeType)) {
switch (kaNoticeType) { switch (kaNoticeType) {
case "CREDIT_SUCC" : case "CREDIT_SUCC" :
// 授信成功 需要 审批 // 授信成功 需要 审批
return new Tuple("CREDIT_SUCC", "授信成功"); return new Tuple("CREDIT_SUCC", "授信成功");
case "APPROVE_ING" : case "APPROVE_ING" :
if (orderApprove == null) { //if (orderApprove == null) {
return new Tuple("APPROVE_ING", "授信成功"); //return new Tuple("APPROVE_ING", "授信成功");
} else { //} else {
return new Tuple("APPROVE_ING", "审批中"); return new Tuple("APPROVE_ING", "审批中");
} //}
case "REJECT" : case "REJECT" :
return new Tuple(kaNoticeType, "审批拒绝"); return new Tuple(kaNoticeType, "审批拒绝");
case "FUAD_ASSIFN_SUCC" : case "FUAD_ASSIFN_SUCC" :
return new Tuple(kaNoticeType, "审批通过"); return new Tuple(kaNoticeType, "审批通过");
case "WITHDRAW_APPROVING" : case "WITHDRAW_APPROVING" :
// 等待二次风控审批 审批中 // 等待二次风控审批 审批中
return new Tuple(kaNoticeType, "提现（二次）审批中"); return new Tuple(kaNoticeType, "二次风控审批中");
case "WITHDRAW" : case "WITHDRAW" :
// 提现申请成功 需要放款 // 提现申请成功 需要放款
return new Tuple(kaNoticeType, "申请提现成功"); return new Tuple(kaNoticeType, "申请提现成功");
...@@ -108,12 +68,7 @@ public class OrderUtil { ...@@ -108,12 +68,7 @@ public class OrderUtil {
case "FUND_WAITING_WITHDRAW" : case "FUND_WAITING_WITHDRAW" :
return new Tuple("FUND_WAITING_WITHDRAW", "放款到存管账户，待二次提现"); return new Tuple("FUND_WAITING_WITHDRAW", "放款到存管账户，待二次提现");
case "FUND_SUCC" : case "FUND_SUCC" :
if (orderApprove != null && orderApprove.getFundType() != 0) { return new Tuple(kaNoticeType, "放款成功");
// 是存管
return new Tuple(kaNoticeType, "放款到存管");
} else {
return new Tuple(kaNoticeType, "放款成功");
}
case "FUND_WITHDRAW_SUCC" : case "FUND_WITHDRAW_SUCC" :
return new Tuple(kaNoticeType, "存管提现成功"); return new Tuple(kaNoticeType, "存管提现成功");
case "FUND_FAIL" : case "FUND_FAIL" :
......
src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/model/CallbackRecordVoModel.java
View file @ 8a88df58
...@@ -24,7 +24,7 @@ public class CallbackRecordVoModel { ...@@ -24,7 +24,7 @@ public class CallbackRecordVoModel {
private Long termNo; private Long termNo;
private KANoticeType noticeType; private String noticeType;
private Integer callbackStatus; private Integer callbackStatus;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment