Merge branch 'features/mo' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into features/mo

# By lupeng (5) and xiaozhe.chen (1)
# Via lupeng (1) and xiaozhe.chen (1)
* 'features/mo' of http://git.quantgroup.cn/QG/cash-loan-flow-boss:
  获取状态中文
  修改获取状态判断
  订单状态添加映射关系
  调整KANoticeType枚举值顺序对应数据库存的序号
  修复代码中订单状态与数据库不匹配问题
  修改jolyne服务域名

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

@@ -549,7 +549,7 @@ public class MoOrderServiceImpl implements OrderService{
                 callbackRecordVoModel.setTermNo(callbackRecord.getTermNo());
 
                 Tuple<String, String> stringStringTuple = OrderUtil.KaNoticeTypeNameConvertChnName(callbackRecord.getNoticeType());
-                callbackRecordVoModel.setNoticeType(stringStringTuple != null ? stringStringTuple.getValue() : callbackRecord.getNoticeType().name());
+                callbackRecordVoModel.setNoticeType(!"未知状态".equals(stringStringTuple.getValue()) ? stringStringTuple.getValue() : callbackRecord.getNoticeType().getDesc());
 
                 callbackRecordVoModel.setCallbackStatus(callbackRecord.getCallbackStatus());
                 callbackRecordVoModel.setChannelId(callbackRecord.getChannelId());
@@ -570,7 +570,7 @@ public class MoOrderServiceImpl implements OrderService{
                 callbackFailRecordVoModel.setTermNo(callbackFailRecord.getTermNo());
 
                 Tuple<String, String> stringStringTuple = OrderUtil.KaNoticeTypeNameConvertChnName(callbackFailRecord.getNoticeType());
-                callbackFailRecordVoModel.setNoticeType(stringStringTuple != null ? stringStringTuple.getValue() : callbackFailRecord.getNoticeType().name());
+                callbackFailRecordVoModel.setNoticeType(!"未知状态".equals(stringStringTuple.getValue()) ? stringStringTuple.getValue() : callbackFailRecord.getNoticeType().getDesc());
 
                 callbackFailRecordVoModel.setCallbackStatus(callbackFailRecord.getCallbackStatus());
                 callbackFailRecordVoModel.setChannelId(callbackFailRecord.getChannelId());

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

@@ -563,7 +563,7 @@ public class OrderServiceImpl implements OrderService {
                 callbackRecordVoModel.setTermNo(callbackRecord.getTermNo());
 
                 Tuple<String, String> stringStringTuple = OrderUtil.KaNoticeTypeNameConvertChnName(callbackRecord.getNoticeType());
-                callbackRecordVoModel.setNoticeType(stringStringTuple != null ? stringStringTuple.getValue() : callbackRecord.getNoticeType().name());
+                callbackRecordVoModel.setNoticeType(!"未知状态".equals(stringStringTuple.getValue()) ? stringStringTuple.getValue() : callbackRecord.getNoticeType().getDesc());
 
                 callbackRecordVoModel.setCallbackStatus(callbackRecord.getCallbackStatus());
                 callbackRecordVoModel.setChannelId(callbackRecord.getChannelId());
@@ -584,7 +584,7 @@ public class OrderServiceImpl implements OrderService {
                 callbackFailRecordVoModel.setTermNo(callbackFailRecord.getTermNo());
 
                 Tuple<String, String> stringStringTuple = OrderUtil.KaNoticeTypeNameConvertChnName(callbackFailRecord.getNoticeType());
-                callbackFailRecordVoModel.setNoticeType(stringStringTuple != null ? stringStringTuple.getValue() : callbackFailRecord.getNoticeType().name());
+                callbackFailRecordVoModel.setNoticeType(!"未知状态".equals(stringStringTuple.getValue()) ? stringStringTuple.getValue() : callbackFailRecord.getNoticeType().getDesc());
 
                 callbackFailRecordVoModel.setCallbackStatus(callbackFailRecord.getCallbackStatus());
                 callbackFailRecordVoModel.setChannelId(callbackFailRecord.getChannelId());

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

@@ -82,6 +82,10 @@ public class OrderUtil {
                     return new Tuple(kaNoticeType, "已关单");
                 case "CANCEL_AFTER_LOAN" :
                     return new Tuple(kaNoticeType, "存管提现超时或贷后关单");
+                case "REPAYMENT_RESULT":
+                    return new Tuple<>(kaNoticeType, "还款结果通知");
+                case "QUOTA_EXPIRED":
+                    return new Tuple<>(kaNoticeType, "额度失效");
                 default:
                     return new Tuple(kaNoticeType, "未知状态");
             }

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/model/KANoticeType.java

@@ -6,7 +6,6 @@ package cn.quantgroup.cashloanflowboss.spi.clf.model;
  * Created with suntao on 2018/4/15
  */
 public enum KANoticeType {
-    CREDIT_ORDER_SUBMITTING("CREDIT_ING","授信中"),
     CREDIT_SUCC("CREDIT_SUCC", "授信成功"),//0
     CREDIT_FAIL("CREDIT_FAIL", "授信失败"),//1
     FUAD_ASSIFN_SUCC("FUAD_ASSIFN_SUCC", "分配资金方成功"),//2
@@ -33,17 +32,17 @@ public enum KANoticeType {
     ADD_CARD_SUCCESS("ADD_CARD_SUCCESS", "添加银行卡成功，非提现页面绑卡"), //23
     REPAY_FAIL("REPAY_FAIL", "还款失败"), //24
 
-
+    UNKNOWN("UNKNOWN", "没有逻辑意义的数据库兼容的值"),
+    RP_INIT_F_SUCC("REPAYMENT_INIT_FUND_SUCC", "放款成功推送还款计划"),
     APPROVE_ING("APPROVE_ING", "审批中"),
     PAY_ING("PAY_ING", "放款中"),
+    TEST("TEST", "test"),
+    REPAYMENT_RESULT("REPAYMENT_RESULT","还款结果告知"),//30
+    QUOTA_EXPIRED("QUOTA_EXPIRED", "额度失效"),//31
     WITHDRAW_APPROVING("WITHDRAW_APPROVING", "提现审批中"),  //对应loan状态50，等待二次审核
     FUND_WAITING_WITHDRAW("FUND_WAITING_WITHDRAW", "放款成功,等待二次提现"),
-
-    UNKNOWN("UNKNOWN", "没有逻辑意义的数据库兼容的值"),
-    RP_INIT_F_SUCC("REPAYMENT_INIT_FUND_SUCC", "放款成功推送还款计划"),
-    TEST("TEST", "test");
-
-
+    CREDIT_ORDER_SUBMITTING("CREDIT_ING","授信中"),
+;
     private String type;
     private String desc;
 

src/main/java/cn/quantgroup/cashloanflowboss/spi/jolyne/JolyneCenter.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.*;
 
 @Component
-@FeignClient(name = "JolyneServiceCenter", url = "http://192.168.4.156:9001", fallback = JolyneCenter.Fallback.class)
+@FeignClient(name = "JolyneServiceCenter", url = "http://jolyne.liangkebang.com", fallback = JolyneCenter.Fallback.class)
 public interface JolyneCenter {