推送失败的 可以重试

src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java

 package cn.quantgroup.cashloanflowboss.api.order.controller;
 
-import cn.quantgroup.cashloanflowboss.api.order.model.ApproveVo;
-import cn.quantgroup.cashloanflowboss.api.order.model.LendingFormModel;
-import cn.quantgroup.cashloanflowboss.api.order.model.RepayStatusEnum;
-import cn.quantgroup.cashloanflowboss.api.order.model.RepaymentPlansResultModel;
+import cn.quantgroup.cashloanflowboss.api.order.model.*;
 import cn.quantgroup.cashloanflowboss.api.order.service.MoOrderServiceImpl;
 import cn.quantgroup.cashloanflowboss.api.order.service.OrderService;
 import cn.quantgroup.cashloanflowboss.component.route.ServiceRoute;
@@ -13,6 +10,8 @@ import cn.quantgroup.cashloanflowboss.core.annotation.channelrole.ChannelIdInit;
 import cn.quantgroup.cashloanflowboss.core.annotation.channelrole.CheckChannelRole;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.core.base.Tuple;
+import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenter;
+import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +37,8 @@ public class OrderController {
     @Autowired
     private ServiceRoute serviceRoute;
 
+    @Autowired
+    private CLFCenter clfCenter;
 
     /**
      * 订单查询列表接口
@@ -243,5 +244,18 @@ public class OrderController {
         return Result.buildSuccess(settle.getKey(), settle.getValue());
     }
 
+    /**
+     * 发起结清
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping("/retryCallback")
+    public Result retryCallback(Long callbackFailRecordId) {
+        log.info("callbackFailRecordId={}", callbackFailRecordId);
+        clfCenter.mgMsgCallbackFailRecordIdRetry(callbackFailRecordId);
+        return Result.buildSuccess(null,"");
+    }
+
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/order/model/RetryCallbackFormModel.java

+package cn.quantgroup.cashloanflowboss.api.order.model;
+
+import cn.quantgroup.cashloanflowboss.component.validator.constraints.NotEmpty;
+import lombok.Data;
+
+/**
+ * Created by WeiWei on 2019/8/13.
+ */
+@Data
+public class RetryCallbackFormModel {
+
+
+    /**
+     * 渠道订单号
+     */
+    @NotEmpty(message = "无效的类型")
+    private String noticeType;
+
+    /**
+     * 结果：true（成功）、false（失败）
+     */
+    @NotEmpty(message = "无效的数据")
+    private String data;
+
+}

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

@@ -568,6 +568,7 @@ public class MoOrderServiceImpl implements OrderService{
         if (CollectionUtils.isNotEmpty(callbackFailRecordList)) {
             for (CallbackFailRecord callbackFailRecord : callbackFailRecordList) {
                 CallbackRecordVoModel callbackFailRecordVoModel = new CallbackRecordVoModel();
+                callbackFailRecordVoModel.setId(callbackFailRecord.getId());
                 callbackFailRecordVoModel.setChannelOrderNo(orderMapping.getChannelOrderNo());
                 callbackFailRecordVoModel.setApplyNo(orderMapping.getApplyNo());
                 callbackFailRecordVoModel.setLoanId(orderMapping.getLoanId());

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

@@ -558,6 +558,7 @@ public class OrderServiceImpl implements OrderService {
         if (CollectionUtils.isNotEmpty(callbackRecordList)) {
             for (CallbackRecord callbackRecord : callbackRecordList) {
                 CallbackRecordVoModel callbackRecordVoModel = new CallbackRecordVoModel();
+                callbackRecordVoModel.setId(callbackRecord.getId());
                 callbackRecordVoModel.setChannelOrderNo(orderMapping.getChannelOrderNo());
                 callbackRecordVoModel.setApplyNo(orderMapping.getApplyNo());
                 callbackRecordVoModel.setLoanId(orderMapping.getLoanId());
@@ -579,6 +580,7 @@ public class OrderServiceImpl implements OrderService {
         if (CollectionUtils.isNotEmpty(callbackFailRecordList)) {
             for (CallbackFailRecord callbackFailRecord : callbackFailRecordList) {
                 CallbackRecordVoModel callbackFailRecordVoModel = new CallbackRecordVoModel();
+                callbackFailRecordVoModel.setId(callbackFailRecord.getId());
                 callbackFailRecordVoModel.setChannelOrderNo(orderMapping.getChannelOrderNo());
                 callbackFailRecordVoModel.setApplyNo(orderMapping.getApplyNo());
                 callbackFailRecordVoModel.setLoanId(orderMapping.getLoanId());

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/service/CLFCenter.java

@@ -13,6 +13,9 @@ public interface CLFCenter {
     @PostMapping(value = "/test//loanMq/batch", consumes = "application/x-www-form-urlencoded")
     void loanMq(@RequestParam("json") String loanMq);
 
+    @GetMapping(value = "/testmq/mgMsgCallbackFailRecordId", consumes = "application/x-www-form-urlencoded")
+    void mgMsgCallbackFailRecordIdRetry(@RequestParam("callbackFailRecordId") Long callbackFailRecordId);
+
     @GetMapping(value = "/configuration/lPm6usTlPYLqtDPQHIldvszWakDHlDh4", consumes = "application/x-www-form-urlencoded")
     void reloadKASetting(@RequestParam("token") String token);
 
@@ -24,6 +27,11 @@ public interface CLFCenter {
             return;
         }
 
+        @Override
+        public void mgMsgCallbackFailRecordIdRetry(Long callbackFailRecordId) {
+
+        }
+
         @Override
         public void reloadKASetting(String token) {