按钮调节

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java

@@ -731,19 +731,25 @@ public class OrderServiceImpl implements OrderService{
                         buttonList.add(buttonBeforeCancel);
                         tuple.setValue(buttonList);
                         return tuple;
+                    case "WITHDRAW_APPROVING" :
+                        tuple.setKey("提现成功，待二次风控审批");
+                        // 更改放款时间,二次风控回调
+                        OrderVo.OptButton secondAudit2 = new OrderVo.OptButton();
+                        secondAudit2.setAction(OrderVo.OptButtonAction.second_audit.name());
+                        secondAudit2.setName(OrderVo.OptButtonAction.second_audit.getDesc());
+                        buttonList.add(secondAudit2);
+                        buttonList.add(buttonBeforeCancel);
+                        tuple.setValue(buttonList);
+                        return tuple;
                     case "WITHDRAW" :
-                        // 提现申请成功 需要放款
-                        tuple.setKey("申请提现成功");
                         LoanApplicationHistory loanApplicationHistory = xyqbCenterService.findLoanApplicationHistoryById(orderMapping.getLoanId());
                         if (loanApplicationHistory != null) {
-
                             if (LoanProgress.WAITING_FUND.equals(loanApplicationHistory.getProgress())) {
                                 // 更改放款时间,二次风控回调
-                                OrderVo.OptButton secondAudit = new OrderVo.OptButton();
-                                secondAudit.setAction(OrderVo.OptButtonAction.second_audit.name());
-                                secondAudit.setName(OrderVo.OptButtonAction.second_audit.getDesc());
-                                buttonList.add(secondAudit);
+                                // 提现申请成功 需要放款
+                                tuple.setKey("二次风控审批中");
                             } else if (LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.equals(loanApplicationHistory.getProgress())) {
+                                tuple.setKey("待放款");
                                 OrderVo.OptButton buttonPaySucc = new OrderVo.OptButton();
                                 buttonPaySucc.setAction(OrderVo.OptButtonAction.pay_succ.name());
                                 buttonPaySucc.setName(OrderVo.OptButtonAction.pay_succ.getDesc());
@@ -757,23 +763,13 @@ public class OrderServiceImpl implements OrderService{
                             tuple.setValue(buttonList);
                         }
                         return tuple;
-                    case "WITHDRAW_APPROVING" :
-                        tuple.setKey("待提现(二次)审批");
-                        // 更改放款时间,二次风控回调
-                        OrderVo.OptButton secondAudit2 = new OrderVo.OptButton();
-                        secondAudit2.setAction(OrderVo.OptButtonAction.second_audit.name());
-                        secondAudit2.setName(OrderVo.OptButtonAction.second_audit.getDesc());
-                        buttonList.add(secondAudit2);
-                        buttonList.add(buttonBeforeCancel);
-                        tuple.setValue(buttonList);
-                        return tuple;
                     case "PAY_ING" :
                         tuple.setKey("放款中(等待几分钟)");
                         buttonList.add(buttonBeforeCancel);
                         tuple.setValue(buttonList);
                         return tuple;
                     case "FUND_WAITING_WITHDRAW" :
-                        tuple.setKey("放款到存管账户，待二次提现");
+                        tuple.setKey("放款到存管账户，待存管提现");
                         OrderVo.OptButton cancelAfterButton0 = new OrderVo.OptButton();
                         cancelAfterButton0.setAction(OrderVo.OptButtonAction.cancel_after.name());
                         cancelAfterButton0.setName(OrderVo.OptButtonAction.cancel_after.getDesc());
@@ -784,7 +780,7 @@ public class OrderServiceImpl implements OrderService{
                         OrderApprove orderApprove2 = orderApproveRepository.findByCreditNumber(orderMapping.getApplyNo());
                         if (orderApprove2 != null && orderApprove2.getFundType() != 0) {
                             // 是存管
-                            tuple.setKey("放款到存管，待二次提现");
+                            tuple.setKey("放款到存管，待存管提现");
                             OrderVo.OptButton cancelAfterButton = new OrderVo.OptButton();
                             cancelAfterButton.setAction(OrderVo.OptButtonAction.cancel_after.name());
                             cancelAfterButton.setName(OrderVo.OptButtonAction.cancel_after.getDesc());

src/main/java/cn/quantgroup/cashloanflowboss/api/order/util/OrderUtil.java

 package cn.quantgroup.cashloanflowboss.api.order.util;
-import java.util.Date;
 
 import cn.quantgroup.cashloanflowboss.api.optlog.entity.OptHistoryLog;
 import cn.quantgroup.cashloanflowboss.api.order.entity.OrderApprove;
-import cn.quantgroup.cashloanflowboss.api.order.model.OrderVo;
-import cn.quantgroup.cashloanflowboss.api.order.model.QueryXyqbOrderStatus;
 import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.ApplyRequestHistory;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;