Merge remote-tracking branch 'origin/v1' into v1

# Conflicts:
#	src/main/java/cn/quantgroup/cashloanflowboss/api/order/controller/OrderController.java
#	src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderService.java

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/controller/ChannelConfController.java

@@ -33,10 +33,10 @@ public class ChannelConfController {
      * @param pageSize
      * @return
      */
-    @Security(authorityId = "Channel.getChannelInfo")
+    @Security(authorityId = "Channel.getChannelList")
     @ChannelIdInit
     @PostMapping("/info")
-    public Result channelInfo(Long channelId, Integer pageNumber, Integer pageSize) {
+    public Result channelList(Long channelId, Integer pageNumber, Integer pageSize) {
         if (pageNumber == null || pageSize == null) {
             return Result.buildFial("page信息不对");
         }
@@ -49,6 +49,7 @@ public class ChannelConfController {
      * @param channelId
      * @return
      */
+    @Security(authorityId = "Channel.getChannelConfInfo")
     @ChannelIdInit
     @CheckChannelRole
     @GetMapping("/cfg/info")
@@ -62,6 +63,7 @@ public class ChannelConfController {
      * @param channelConfVo
      * @return
      */
+    @Security(authorityId = "Channel.editChannelConfInfo")
     @CheckChannelRole(isObjParam = true, paramClazz = ChannelConfVo.class)
     @PostMapping("/cfg/info")
     public Result editChannelConfInfo(@RequestBody @Valid ChannelConfVo channelConfVo) {

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfService.java

 package cn.quantgroup.cashloanflowboss.api.channel.service;
-import java.sql.Timestamp;
-import java.util.*;
 
-import cn.quantgroup.cashloanflowboss.api.channel.entity.ChannelConf;
-import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfAddModel;
-import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfBaseModel;
 import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfVo;
 import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelListModel;
-import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfCallbackConfiguration;
-import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfChannelConfiguration;
-import cn.quantgroup.cashloanflowboss.api.channel.repository.ChannelConfRepository;
-import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderCallBack;
-import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfCallbackConfigurationRepository;
-import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfChannelConfigurationRepository;
-import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
-import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfOrderCallbackRepository;
-import cn.quantgroup.cashloanflowboss.utils.IgnorePropertiesUtil;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.stereotype.Service;
-
-import javax.persistence.criteria.Predicate;
 
 /**
  * function:
- * date: 2019/8/2
+ * date: 2019/9/16
  *
  * @author: suntao
  */
+public interface ChannelConfService {
 
-@Service
-public class ChannelConfService {
-
-    @Autowired
-    private ChannelConfRepository channelConfRepository;
-    @Autowired
-    private ClfChannelConfigurationRepository clfChannelConfigurationRepository;
-    @Autowired
-    private ClfCallbackConfigurationRepository clfCallbackConfigurationRepository;
-    @Autowired
-    private ClfOrderCallbackRepository clfOrderCallbackRepository;
-
-
-
-    public Page<ChannelListModel> getChannelInfo(Integer pageNumber, Integer pageSize, Long channelId) {
-
-        Page<ClfChannelConfiguration> page = this.clfChannelConfigurationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
-
-            List<Predicate> predicates = new ArrayList<>();
-
-            // 指定渠道号
-            if (Objects.nonNull(channelId)) {
-                predicates.add(criteriaBuilder.equal(root.get("registeredFrom"), channelId.longValue()));
-            }
-
-            // 设置查询条件
-            criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
-            // 指定排序
-            criteriaQuery.orderBy(criteriaBuilder.desc(root.get("id")));
-
-            return criteriaQuery.getRestriction();
-
-        }, new PageRequest(pageNumber, pageSize));
-
-        Page<ChannelListModel> channelListModelPage = page.map(it -> {
-            ChannelListModel channelListModel = new ChannelListModel();
-            channelListModel.setChannelId(it.getRegisteredFrom());
-            channelListModel.setChannelName(it.getChannelName());
-            channelListModel.setChannelCode(it.getChannelCode());
-            // TODO 
-            channelListModel.setBizType(null);
-            channelListModel.setCreatedAt(it.getCreatedAt());
-            return channelListModel;
-        });
-
-        return channelListModelPage;
-    }
-
-
-    public ChannelConfVo getChannelConf(Long channelId) {
-        ChannelConf channelConf = channelConfRepository.getByChannelId(channelId);
-        return ChannelConfUtil.channelConfConvertVOModel(channelConf);
-    }
-
-
-    public Boolean editChannelConfInfo(ChannelConfVo confVo) {
-        ChannelConfBaseModel basicInfo = confVo.getBasicInfo();
-        ChannelConfAddModel addInfo = confVo.getAddInfo();
-
-        ChannelConf channelConf = ChannelConfUtil.voModelConfConvertChannelConf(confVo);
-
-        ChannelConf channelConfExsit = channelConfRepository.getByChannelId(basicInfo.getChannelId());
-
-        // cash-loan-flow-boss 库
-        if (channelConfExsit == null) {
-            // 新保存
-            channelConf.setCreateTime(new Date());
-            channelConfRepository.save(channelConf);
-        } else {
-            // 更新数据库 数据
-            BeanUtils.copyProperties(channelConf, channelConfExsit, IgnorePropertiesUtil.getNullPropertyNames(channelConf));
-            channelConfExsit.setUpdateTime(new Date());
-            channelConfRepository.save(channelConfExsit);
-        }
-
-        // clf 库
-        ClfChannelConfiguration channelConfiguration = ChannelConfUtil.convert2ClfChannelConfiguration(basicInfo);
-        List<ClfOrderCallBack> clfOrderCallBackList = ChannelConfUtil.convert2ClfOrderCallback(basicInfo.getChannelId(), addInfo);
-        ClfChannelConfiguration channelConfigurationExsit = clfChannelConfigurationRepository.findByRegisteredFrom(basicInfo.getChannelId());
-        if (channelConfigurationExsit == null) {
-            // 新保存
-            channelConfiguration.setCreatedAt(new Timestamp(System.currentTimeMillis()));
-            clfChannelConfigurationRepository.save(channelConfiguration);
-
-            ClfCallbackConfiguration clfCallbackConfiguration = ChannelConfUtil.convert2ClfCallbackConfiguration(basicInfo);
-            clfCallbackConfigurationRepository.save(clfCallbackConfiguration);
-
-            clfOrderCallbackRepository.save(clfOrderCallBackList);
-        } else {
-            // update
-            BeanUtils.copyProperties(channelConfiguration, channelConfigurationExsit, IgnorePropertiesUtil.getNullPropertyNames(channelConfiguration));
-            clfChannelConfigurationRepository.save(channelConfigurationExsit);
+    Page<ChannelListModel> getChannelInfo(Integer pageNumber, Integer pageSize, Long channelId);
 
-            clfOrderCallbackRepository.save(clfOrderCallBackList);
+    ChannelConfVo getChannelConf(Long channelId);
 
-        }
-        return true;
-    }
+    Boolean editChannelConfInfo(ChannelConfVo confVo);
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/service/ChannelConfServiceImpl.java

+package cn.quantgroup.cashloanflowboss.api.channel.service;
+import java.sql.Timestamp;
+import java.util.*;
+
+import cn.quantgroup.cashloanflowboss.api.channel.entity.ChannelConf;
+import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfAddModel;
+import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfBaseModel;
+import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfVo;
+import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelListModel;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfCallbackConfiguration;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfChannelConfiguration;
+import cn.quantgroup.cashloanflowboss.api.channel.repository.ChannelConfRepository;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderCallBack;
+import cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType;
+import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
+import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService;
+import cn.quantgroup.cashloanflowboss.utils.IgnorePropertiesUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+/**
+ * function:
+ * date: 2019/8/2
+ *
+ * @author: suntao
+ */
+
+@Service
+public class ChannelConfServiceImpl implements ChannelConfService{
+
+    @Autowired
+    private CLFCenterService clfCenterService;
+
+    @Autowired
+    private ChannelConfRepository channelConfRepository;
+
+
+
+    @Override
+    public Page<ChannelListModel> getChannelInfo(Integer pageNumber, Integer pageSize, Long channelId) {
+
+        Page<ClfChannelConfiguration> page = clfCenterService.findChannelConfigurationByCriteriaQueryPage(pageNumber, pageSize, channelId);
+
+        Page<ChannelListModel> channelListModelPage = page.map(it -> {
+            ChannelListModel channelListModel = new ChannelListModel();
+            channelListModel.setChannelId(it.getRegisteredFrom());
+            channelListModel.setChannelName(it.getChannelName());
+            channelListModel.setChannelCode(it.getChannelCode());
+            channelListModel.setBizType(null);
+            channelListModel.setCreatedAt(it.getCreatedAt());
+            return channelListModel;
+        });
+
+        return channelListModelPage;
+    }
+
+    @Override
+    public ChannelConfVo getChannelConf(Long channelId) {
+        ChannelConf channelConf = channelConfRepository.getByChannelId(channelId);
+
+        if (channelConf != null) {
+            return ChannelConfUtil.channelConfConvertVOModel(channelConf);
+        } else {
+            // boss channel_conf 为空，从clf 查询数据
+            ClfChannelConfiguration channelConfiguration = clfCenterService.findChannelConfigurationByChannelId(channelId);
+
+            ClfOrderCallBack approve = clfCenterService.findOrderCallBackByByCallbackStatusAndChannelId(KANoticeType.FUAD_ASSIFN_SUCC.name(), channelId);
+            ClfOrderCallBack orderStatus = clfCenterService.findOrderCallBackByByCallbackStatusAndChannelId(KANoticeType.FUND_SUCC.name(), channelId);
+            ClfOrderCallBack repaymentPlan = clfCenterService.findOrderCallBackByByCallbackStatusAndChannelId(KANoticeType.REPAYMENT.name(), channelId);
+
+            return ChannelConfUtil.getChannelConfVoByClf(channelConfiguration, approve, orderStatus, repaymentPlan);
+        }
+    }
+
+    @Override
+    public Boolean editChannelConfInfo(ChannelConfVo confVo) {
+        ChannelConfBaseModel basicInfo = confVo.getBasicInfo();
+        ChannelConfAddModel addInfo = confVo.getAddInfo();
+
+        ChannelConf channelConf = ChannelConfUtil.voModelConfConvertChannelConf(confVo);
+
+        ChannelConf channelConfExsit = channelConfRepository.getByChannelId(basicInfo.getChannelId());
+
+        // cash-loan-flow-boss 库
+        if (channelConfExsit == null) {
+            // 新保存
+            channelConf.setCreateTime(new Date());
+            channelConfRepository.save(channelConf);
+        } else {
+            // 更新数据库 数据
+            BeanUtils.copyProperties(channelConf, channelConfExsit, IgnorePropertiesUtil.getNullPropertyNames(channelConf));
+            channelConfExsit.setUpdateTime(new Date());
+            channelConfRepository.save(channelConfExsit);
+        }
+
+        // clf 库
+        ClfChannelConfiguration channelConfiguration = ChannelConfUtil.convert2ClfChannelConfiguration(basicInfo);
+        List<ClfOrderCallBack> clfOrderCallBackList = ChannelConfUtil.convert2ClfOrderCallback(basicInfo.getChannelId(), addInfo);
+        ClfChannelConfiguration channelConfigurationExsit = clfCenterService.findChannelConfigurationByChannelId(basicInfo.getChannelId());
+        if (channelConfigurationExsit == null) {
+            // 新保存
+            channelConfiguration.setCreatedAt(new Timestamp(System.currentTimeMillis()));
+            clfCenterService.saveChannelConfiguration(channelConfiguration);
+
+            ClfCallbackConfiguration clfCallbackConfiguration = ChannelConfUtil.convert2ClfCallbackConfiguration(basicInfo);
+            clfCenterService.saveCallbackConfiguration(clfCallbackConfiguration);
+
+            clfCenterService.saveOrderCall(clfOrderCallBackList);
+        } else {
+            // update
+            BeanUtils.copyProperties(channelConfiguration, channelConfigurationExsit, IgnorePropertiesUtil.getNullPropertyNames(channelConfiguration));
+            clfCenterService.saveChannelConfiguration(channelConfigurationExsit);
+
+            // 更新OrderCallBack
+            for (ClfOrderCallBack clfOrderCallBack : clfOrderCallBackList) {
+                ClfOrderCallBack orderCallBackExsit = clfCenterService.findOrderCallBackByByCallbackStatusAndChannelId(clfOrderCallBack.getCallbackStatus().name(), clfOrderCallBack.getRegisteredFrom());
+                if (orderCallBackExsit != null) {
+                    clfOrderCallBack.setId(orderCallBackExsit.getId());
+                }
+            }
+            clfCenterService.saveOrderCall(clfOrderCallBackList);
+        }
+        return true;
+    }
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/util/ChannelConfUtil.java

@@ -208,4 +208,37 @@ public class ChannelConfUtil {
             return channelConf.getP2pFundId();
         }
     }
+
+    public static ChannelConfVo getChannelConfVoByClf(ClfChannelConfiguration channelConfiguration, ClfOrderCallBack approve, ClfOrderCallBack orderStatus, ClfOrderCallBack repaymentPlan) {
+        ChannelConfVo channelConfVo = new ChannelConfVo();
+        ChannelConfBaseModel channelConfBaseModel = new ChannelConfBaseModel();
+        if (channelConfiguration != null) {
+            channelConfBaseModel.setChannelId(channelConfiguration.getRegisteredFrom());
+            channelConfBaseModel.setChannelName(channelConfiguration.getChannelName());
+            channelConfBaseModel.setChannelCode(channelConfiguration.getChannelCode());
+            channelConfBaseModel.setEnv("");
+            channelConfBaseModel.setFundId(0);
+            channelConfBaseModel.setP2pFundId(0);
+            channelConfBaseModel.setBizType(0);
+            channelConfBaseModel.setAesKey(channelConfiguration.getAesKey());
+            channelConfBaseModel.setMd5Key(channelConfiguration.getMd5Key());
+            channelConfBaseModel.setAuthCode(channelConfiguration.getSpiderCenterMerchantChannelCode());
+            channelConfBaseModel.setRiskCode(channelConfiguration.getSpiderCenterChannelCode());
+        }
+
+
+        ChannelConfAddModel channelConfAddModel = new ChannelConfAddModel();
+        channelConfAddModel.setEnvPath("");
+        channelConfAddModel.setChannelIp("");
+        channelConfAddModel.setApproveCallBackUrl(approve != null ? approve.getCallbackUrl() : "");
+        channelConfAddModel.setOrderStatusCallBackUrl(orderStatus != null ? orderStatus.getCallbackUrl() : "");
+        channelConfAddModel.setRepayResultCallBackUrl("");
+        channelConfAddModel.setRepaymentPlanCallBackUrl(repaymentPlan != null ? repaymentPlan.getCallbackUrl() : "");
+        channelConfAddModel.setMessage("");
+        channelConfAddModel.setExtendData("");
+
+        channelConfVo.setBasicInfo(channelConfBaseModel);
+        channelConfVo.setAddInfo(channelConfAddModel);
+        return channelConfVo;
+    }
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/log/controller/LogController.java → src/main/java/cn/quantgroup/cashloanflowboss/api/login/controller/LogController.java

-package cn.quantgroup.cashloanflowboss.api.log.controller;
+package cn.quantgroup.cashloanflowboss.api.login.controller;
 
-import cn.quantgroup.cashloanflowboss.api.log.model.LoginFormModel;
-import cn.quantgroup.cashloanflowboss.api.log.service.LogService;
+import cn.quantgroup.cashloanflowboss.api.login.model.LoginFormModel;
+import cn.quantgroup.cashloanflowboss.api.login.service.LogService;
 import cn.quantgroup.cashloanflowboss.component.security.Authority;
 import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
 import cn.quantgroup.cashloanflowboss.core.base.Result;

src/main/java/cn/quantgroup/cashloanflowboss/api/log/model/LoginFormModel.java → src/main/java/cn/quantgroup/cashloanflowboss/api/login/model/LoginFormModel.java

-package cn.quantgroup.cashloanflowboss.api.log.model;
+package cn.quantgroup.cashloanflowboss.api.login.model;
 
 import cn.quantgroup.cashloanflowboss.component.validator.constraints.NotEmpty;
 import lombok.Data;

src/main/java/cn/quantgroup/cashloanflowboss/api/log/model/Principal.java → src/main/java/cn/quantgroup/cashloanflowboss/api/login/model/Principal.java

-package cn.quantgroup.cashloanflowboss.api.log.model;
+package cn.quantgroup.cashloanflowboss.api.login.model;
 
 import cn.quantgroup.cashloanflowboss.api.role.entity.Role;
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserRank;

src/main/java/cn/quantgroup/cashloanflowboss/api/log/service/LogService.java → src/main/java/cn/quantgroup/cashloanflowboss/api/login/service/LogService.java

-package cn.quantgroup.cashloanflowboss.api.log.service;
+package cn.quantgroup.cashloanflowboss.api.login.service;
 
-import cn.quantgroup.cashloanflowboss.api.log.model.Principal;
+import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
 import cn.quantgroup.cashloanflowboss.api.user.entity.User;
 import cn.quantgroup.cashloanflowboss.api.user.service.UserService;
@@ -11,6 +11,7 @@ import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import cn.quantgroup.cashloanflowboss.utils.MD5Tools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/controller/OperateController.java

+package cn.quantgroup.cashloanflowboss.api.optlog.controller;
+
+import cn.quantgroup.cashloanflowboss.api.optlog.entity.OptHistoryLog;
+import cn.quantgroup.cashloanflowboss.api.optlog.service.OptHistoryLogService;
+import cn.quantgroup.cashloanflowboss.api.order.model.OrderBaseModel;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * function:
+ * date: 2019/9/4
+ *
+ * @author: suntao
+ */
+@RestController
+@RequestMapping("/opt")
+public class OperateController {
+
+    @Autowired
+    private OptHistoryLogService optHistoryLogService;
+
+
+    @GetMapping("/history/log/all")
+    public Result findAllOptHistoryLog(OrderBaseModel orderBaseModel) {
+        final List<OptHistoryLog> allOptHistoryLog = optHistoryLogService.getAllOptHistoryLog(orderBaseModel);
+        if (CollectionUtils.isNotEmpty(allOptHistoryLog)) {
+            return Result.buildSuccess(allOptHistoryLog);
+        } else {
+            return Result.buildSuccess("无数据");
+        }
+    }
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/entity/OptHistoryLog.java

+package cn.quantgroup.cashloanflowboss.api.optlog.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 操作日志记录
+ * function:
+ * date: 2019/8/12
+ *
+ * @author: suntao
+ */
+
+@Data
+@Entity
+@Table(name = "opt_history_log")
+public class OptHistoryLog {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "channel_order_number")
+    private String channelOrderNumber;
+
+    @Column(name = "credit_number")
+    private String creditNumber;
+
+    @Column(name = "loan_id")
+    private Long loanId;
+
+    @Column(name = "channel_id")
+    private Long channelId;
+
+    /**
+     * 操作节点名称
+     */
+    @Column(name = "opt_name")
+    private String optName;
+
+    /**
+     * 操作节点名称
+     */
+    @Column(name = "opt_user")
+    private String optUser;
+
+    /**
+     * 操作详细日志
+     */
+    @Column(name = "opt_log_detail")
+    private String optLogDetail;
+
+    /**
+     * 操作详细日志
+     */
+    @Column(name = "ext_data")
+    private String extData;
+
+    /** 0:失败；1：成功 */
+    @Column(name = "opt_result")
+    private Boolean optResult;
+
+    @Column(name = "create_time")
+    private Date createTime;
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/repository/OptHistoryLogRepository.java

+package cn.quantgroup.cashloanflowboss.api.optlog.repository;
+
+import cn.quantgroup.cashloanflowboss.api.optlog.entity.OptHistoryLog;
+import cn.quantgroup.cashloanflowboss.api.order.entity.OrderApprove;
+import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowBossDataSource;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * function:
+ * date: 2019/8/12
+ *
+ * @author: suntao
+ */
+@CashLoanFlowBossDataSource
+@Repository
+public interface OptHistoryLogRepository extends PagingAndSortingRepository<OptHistoryLog, Long>, JpaSpecificationExecutor<OptHistoryLog> {
+
+    List<OptHistoryLog> findByChannelOrderNumber(String channelOrderNumber);
+
+    List<OptHistoryLog> findByCreditNumber(String creditOrderNumber);
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/service/OptHistoryLogService.java

+package cn.quantgroup.cashloanflowboss.api.optlog.service;
+
+import cn.quantgroup.cashloanflowboss.api.optlog.entity.OptHistoryLog;
+import cn.quantgroup.cashloanflowboss.api.order.model.OrderBaseModel;
+
+import java.util.List;
+
+/**
+ * function:
+ * date: 2019/9/16
+ *
+ * @author: suntao
+ */
+public interface OptHistoryLogService {
+    List<OptHistoryLog> getAllOptHistoryLog(OrderBaseModel orderBaseModel);
+
+    List<OptHistoryLog> getLocalOptHisttoryLog(OrderBaseModel orderBaseModel);
+
+    void save(OptHistoryLog optHistoryLog);
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/optlog/service/OptHistoryLogServiceImpl.java

+package cn.quantgroup.cashloanflowboss.api.optlog.service;
+
+import cn.quantgroup.cashloanflowboss.api.optlog.entity.OptHistoryLog;
+import cn.quantgroup.cashloanflowboss.api.optlog.repository.OptHistoryLogRepository;
+import cn.quantgroup.cashloanflowboss.api.order.model.OrderBaseModel;
+import cn.quantgroup.cashloanflowboss.api.order.util.OrderUtil;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ApplyRequestHistory;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.WithdrawRecord;
+import cn.quantgroup.cashloanflowboss.spi.clf.service.CLFCenterService;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * function:
+ * date: 2019/9/4
+ *
+ * @author: suntao
+ */
+@Service
+public class OptHistoryLogServiceImpl implements OptHistoryLogService {
+
+
+    @Autowired
+    private CLFCenterService clfCenterService;
+    @Autowired
+    private OptHistoryLogRepository optHistoryLogRepository;
+
+
+    @Override
+    public List<OptHistoryLog> getAllOptHistoryLog(OrderBaseModel orderBaseModel) {
+
+        ClfOrderMapping orderMapping = clfCenterService.findOrderMappingByChannelOrderNo(orderBaseModel.getChannelOrderNumber());
+        if (orderMapping == null) {
+            return null;
+        }
+        // 用户操作日志 进件。。。
+        List<ApplyRequestHistory> applyRequestHistoryList = clfCenterService.findApplyRequestHistoryBySpecification(orderBaseModel);
+        // 管理员操作日志 审批。。。
+        List<OptHistoryLog> optHistoryLogList = getLocalOptHisttoryLog(orderBaseModel);
+
+        // 提现记录
+        List<WithdrawRecord> withdrawRecordList = clfCenterService.findWithdrawRecordList(orderBaseModel.getChannelOrderNumber(), orderMapping.getRegisteredFrom());
+        List<OptHistoryLog> withdrawOptHistoryLogList = OrderUtil.convertWithdrawRecordList2UserOptHistoryLogList(withdrawRecordList);
+
+
+        // 转换
+        List<OptHistoryLog> userOptHistoryLogList = OrderUtil.convertApplyRequestHistoryList2OptHistoryLogList(applyRequestHistoryList, orderMapping);
+        if (CollectionUtils.isNotEmpty(optHistoryLogList)) {
+            userOptHistoryLogList.addAll(optHistoryLogList);
+        }
+        if (CollectionUtils.isNotEmpty(withdrawOptHistoryLogList)) {
+            userOptHistoryLogList.addAll(withdrawOptHistoryLogList);
+        }
+
+        userOptHistoryLogList.sort((o1, o2)->{
+            if (o1.getCreateTime().getTime() < o2.getCreateTime().getTime()) {
+                return -1;
+            } else {
+                return 1;
+            }
+        });
+
+        return userOptHistoryLogList;
+    }
+
+    /**
+     * 只获取操作日志，boss库数据
+     * @param orderBaseModel
+     * @return
+     */
+    @Override
+    public List<OptHistoryLog> getLocalOptHisttoryLog(OrderBaseModel orderBaseModel) {
+
+        List<OptHistoryLog> page = this.optHistoryLogRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
+
+            List<Predicate> predicates = new ArrayList<>();
+
+            // 指定渠道号
+            if (Objects.nonNull(orderBaseModel.getChannelId())) {
+                predicates.add(criteriaBuilder.equal(root.get("channelId"), orderBaseModel.getChannelId().longValue()));
+            }
+            if (StringUtils.isNotEmpty(orderBaseModel.getChannelOrderNumber())) {
+                predicates.add(criteriaBuilder.equal(root.get("channelOrderNumber"), orderBaseModel.getChannelOrderNumber()));
+            }
+            if (StringUtils.isNotEmpty(orderBaseModel.getApplyNo())) {
+                predicates.add(criteriaBuilder.equal(root.get("applyNo"), orderBaseModel.getApplyNo()));
+            }
+            if (orderBaseModel.getLoanId() != null && orderBaseModel.getLoanId() > 0) {
+                predicates.add(criteriaBuilder.equal(root.get("loanId"), orderBaseModel.getLoanId()));
+            }
+
+            // 设置查询条件
+            criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
+            // 指定排序
+            criteriaQuery.orderBy(criteriaBuilder.desc(root.get("id")));
+
+            return criteriaQuery.getRestriction();
+        });
+        return page;
+    }
+
+    @Override
+    public void save(OptHistoryLog optHistoryLog) {
+        optHistoryLogRepository.save(optHistoryLog);
+    }
+
+
+}

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.OrderVo;
 import cn.quantgroup.cashloanflowboss.api.order.service.OrderService;
 import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
+import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.annotation.ChannelIdInit;
 import cn.quantgroup.cashloanflowboss.core.annotation.CheckChannelRole;
 import cn.quantgroup.cashloanflowboss.core.annotation.CheckChannelRoleByChannelOrderNumber;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
+import cn.quantgroup.cashloanflowboss.core.base.Tuple;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,6 +29,7 @@ public class OrderController {
     @Autowired
     private OrderService orderService;
 
+
     /**
      * 订单查询列表接口
      *
@@ -42,11 +43,11 @@ public class OrderController {
     @ChannelIdInit
     @CheckChannelRole
     @GetMapping("/list")
-    public Result getOrders(Long channelId, String channelOrderNumber, Integer pageNumber, Integer pageSize) {
+    public Result orderList(Long channelId, String channelOrderNumber, String applyNo, Long loanId, Integer pageNumber, Integer pageSize) {
         if (pageNumber == null || pageSize == null) {
             return Result.buildFial("page信息不对");
         }
-        return Result.buildSuccess(orderService.getOrders(channelId, channelOrderNumber, pageNumber, pageSize));
+        return Result.buildSuccess(orderService.orderList(channelId, channelOrderNumber, applyNo, loanId, pageNumber, pageSize));
     }
 
 
@@ -56,10 +57,22 @@ public class OrderController {
      * @param approveVo
      * @return
      */
+    @Security(authorityId = "Order.approveOpt")
     @ChannelIdInit
     @PostMapping("/approve")
     public Result approveOpt(@RequestBody @Valid ApproveVo approveVo) {
-        return Result.buildSuccess(orderService.approveOpt(approveVo));
+
+        if (Application.isDebug()) {
+            Tuple<Boolean, Boolean> approveOptBooleanAndFundSettingBooleanTuple = orderService.approveOpt(approveVo);
+            Boolean approveResult = approveOptBooleanAndFundSettingBooleanTuple.getKey();
+            if (approveResult) {
+                return Result.buildSuccess(approveResult, approveOptBooleanAndFundSettingBooleanTuple.getValue() ? "审批操作成功" : "请检查资产计划配置，审批操作成功");
+            } else {
+                return Result.buildSuccess(false,"审批操作失败");
+            }
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -67,9 +80,31 @@ public class OrderController {
      *
      * @return
      */
+    @Security(authorityId = "Order.lending")
     @PostMapping("/lending")
     public Result<Boolean> lending(@RequestBody @Valid LendingFormModel lendingFormModel) {
-        return Result.buildSuccess(this.orderService.lending(lendingFormModel));
+        if (Application.isDebug()) {
+            boolean lendingResult = this.orderService.lending(lendingFormModel);
+            return Result.buildSuccess(lendingResult, lendingResult ? "放款操作成功" : "放款操作失败");
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
+    }
+
+    /**
+     * 二次风控审批
+     *
+     * @return
+     */
+    @Security(authorityId = "Order.secondAudit")
+    @GetMapping("/secondAudit")
+    public Result<Boolean> secondAudit(String channelOrderNumber) {
+        if (Application.isDebug()) {
+            boolean secondAudit = this.orderService.secondAudit(channelOrderNumber);
+            return Result.buildSuccess(secondAudit, secondAudit ? "操作成功" : "操作失败");
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -77,9 +112,14 @@ public class OrderController {
      *
      * @return
      */
+    @Security(authorityId = "Order.cancelPreLoan")
     @PostMapping("/cancel/loan")
-    public Result<Boolean> cancelPreLoan(@RequestParam @Valid String channelOrderNumber) {
+    public Result<Boolean> cancelPreLoan(@RequestBody @Valid String channelOrderNumber) {
+        if (Application.isDebug()) {
             return Result.buildSuccess(this.orderService.cancelPreLoan(channelOrderNumber));
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -87,9 +127,14 @@ public class OrderController {
      *
      * @return
      */
+    @Security(authorityId = "Order.cancelAfterLoan")
     @PostMapping("/cancel/after/loan")
     public Result<Boolean> cancelAfterLoan(@RequestParam @Valid String channelOrderNumber) {
+        if (Application.isDebug()) {
             return Result.buildSuccess(this.orderService.cancelAfterLoan(channelOrderNumber));
+        } else {
+            return Result.buildSuccess(false,"无此操作");
+        }
     }
 
     /**
@@ -98,6 +143,7 @@ public class OrderController {
      * @param channelOrderNumber
      * @return
      */
+    @Security(authorityId = "Order.getOrderHistoryStatus")
     @ChannelIdInit
     @CheckChannelRoleByChannelOrderNumber
     @GetMapping("/history/status")
@@ -105,5 +151,37 @@ public class OrderController {
         return Result.buildSuccess(orderService.getOrderHistoryStatus(channelOrderNumber));
     }
 
+    /**
+     * 订单状态推送历史记录
+     *
+     * @param channelOrderNumber
+     * @return
+     */
+    @Security(authorityId = "Order.orderCallbackRecordList")
+    @ChannelIdInit
+    @CheckChannelRoleByChannelOrderNumber
+    @GetMapping("/orderCallbackRecordList")
+    public Result orderCallbackRecordList(String channelOrderNumber) {
+        return Result.buildSuccess(orderService.getOrderCallbackRecordList(channelOrderNumber));
+    }
+
+
+    /**
+     * 订单还款计划
+     *
+     * @param channelOrderNumber
+     * @return
+     */
+    @Security(authorityId = "Order.repaymentPlan")
+    @ChannelIdInit
+    @CheckChannelRoleByChannelOrderNumber
+    @GetMapping("/repaymentPlan")
+    public Result repaymentPlan(String channelOrderNumber, Long loanId) {
+        return Result.buildSuccess(orderService.findRepaymentPlan(channelOrderNumber, loanId));
+    }
+
+
+
+
 
 }

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

@@ -16,9 +16,7 @@ public class ApproveVo {
 
     @NotNull(message = "审批，订单号不能为空")
     private String channelOrderNumber;
-    @NotNull(message = "审批，金额不能为空")
     private String amount;
-    @NotNull(message = "审批，期数不能为空")
     private Integer period;
     @NotNull(message = "审批，资金类型不能为空")
     private Integer fundType;

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

+package cn.quantgroup.cashloanflowboss.api.order.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * function:
+ * date: 2019/8/15
+ *
+ * @author: suntao
+ */
+
+@Data
+public class HistoryOrderStatusVoModel {
+    private List<VoOrderStatus> historyStatus;
+}

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

+package cn.quantgroup.cashloanflowboss.api.order.model;
+
+import lombok.Data;
+
+/**
+ * function:
+ * date: 2019/9/4
+ *
+ * @author: suntao
+ */
+@Data
+public class OrderBaseModel {
+
+    private String channelOrderNumber;
+    private String applyNo;
+    private Long loanId;
+    private Long channelId;
+}

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

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.api.order.model;
 
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,7 +17,9 @@ public class OrderVo {
     private Long id;
     private Long channelId;
     private String channelOrderNumber;
-    private Long createdAt;
+    private Long loanId;
+    private String applyNo;
+    private Date createdAt;
     private String status;
     /**
      * [ {action:"audit",name:"审核"},{},{}...  ]
@@ -34,6 +37,7 @@ public class OrderVo {
     public enum  OptButtonAction {
         audit("审批"),
         cancel("贷前关单"),
+        second_audit("二次风控审批"),
         pay_succ("放款成功"),
         pay_fail("放款失败"),
         withdraw_second("存管提现"),

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

+package cn.quantgroup.cashloanflowboss.api.order.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * function:
+ * date: 2019/8/16
+ *
+ * @author: suntao
+ */
+@Data
+public class VoOrderStatus {
+    private String status;
+    private Date updateTime;
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/order/repository/OrderApproveRepository.java

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Repository;
 public interface OrderApproveRepository extends JpaRepository<OrderApprove, Long> {
 
     OrderApprove findByChannelOrderNumber(String channelOrderNumber);
+
     OrderApprove findByCreditNumber(String creditOrderNumber);
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/user/model/UserDetailInfo.java

 package cn.quantgroup.cashloanflowboss.api.user.model;
 
-import cn.quantgroup.cashloanflowboss.api.log.model.Principal;
+import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.api.role.entity.Role;
 import cn.quantgroup.cashloanflowboss.core.asserts.Assert;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
@@ -30,7 +30,7 @@ public class UserDetailInfo {
     }
 
     @Data
-    static class UserInfo {
+    public static class UserInfo {
         private Long userId;
         private String userName;
     }

src/main/java/cn/quantgroup/cashloanflowboss/api/user/service/UserService.java

 package cn.quantgroup.cashloanflowboss.api.user.service;
 
-import cn.quantgroup.cashloanflowboss.api.log.model.Principal;
+import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
 import cn.quantgroup.cashloanflowboss.api.user.entity.User;
 import cn.quantgroup.cashloanflowboss.api.user.model.UserDetailInfo;

src/main/java/cn/quantgroup/cashloanflowboss/core/Application.java

 package cn.quantgroup.cashloanflowboss.core;
 
-import cn.quantgroup.cashloanflowboss.api.log.model.Principal;
+import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationDictionary;
 import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEvent;
@@ -28,6 +29,7 @@ public class Application implements ApplicationContextAware, ServletContextAware
 
     private static ServletContext servletContext;
 
+
     public static ApplicationContext getApplicationContext() {
         return applicationContext;
     }
@@ -73,6 +75,15 @@ public class Application implements ApplicationContextAware, ServletContextAware
         return Application.getValue("${server.port}");
     }
 
+    /**
+     * 是否是测试环境
+     *
+     * @return
+     */
+    public static Boolean isDebug() {
+        return "true".equals(Application.getValue("${debug.model}"));
+    }
+
     /**
      * 获取配置属性值
      *

src/main/java/cn/quantgroup/cashloanflowboss/core/aspect/RoleLoadAspect.java

@@ -2,7 +2,7 @@ package cn.quantgroup.cashloanflowboss.core.aspect;
 
 import cn.quantgroup.cashloanflowboss.api.channel.model.ChannelConfVo;
 import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
-import cn.quantgroup.cashloanflowboss.api.log.model.Principal;
+import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.annotation.ChannelIdInit;
 import cn.quantgroup.cashloanflowboss.core.annotation.CheckChannelRole;

src/main/java/cn/quantgroup/cashloanflowboss/core/base/BossPageImpl.java

-package cn.quantgroup.cashloanflowboss.core.base;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * function:
- * date: 2019/8/6
- *
- * @author: suntao
- */
-public class BossPageImpl<T> implements Page {
-
-    @Override
-    public int getTotalPages() {
-        return 0;
-    }
-
-    @Override
-    public long getTotalElements() {
-        return 0;
-    }
-
-    @Override
-    public Page map(Converter converter) {
-        return null;
-    }
-
-    @Override
-    public int getNumber() {
-        return 0;
-    }
-
-    @Override
-    public int getSize() {
-        return 0;
-    }
-
-    @Override
-    public int getNumberOfElements() {
-        return 0;
-    }
-
-    @Override
-    public List getContent() {
-        return null;
-    }
-
-    @Override
-    public boolean hasContent() {
-        return false;
-    }
-
-    @Override
-    public Sort getSort() {
-        return null;
-    }
-
-    @Override
-    public boolean isFirst() {
-        return false;
-    }
-
-    @Override
-    public boolean isLast() {
-        return false;
-    }
-
-    @Override
-    public boolean hasNext() {
-        return false;
-    }
-
-    @Override
-    public boolean hasPrevious() {
-        return false;
-    }
-
-    @Override
-    public Pageable nextPageable() {
-        return null;
-    }
-
-    @Override
-    public Pageable previousPageable() {
-        return null;
-    }
-
-    @Override
-    public Iterator iterator() {
-        return null;
-    }
-}

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/ApplicationSecurityHandler.java

 package cn.quantgroup.cashloanflowboss.core.configuration;
 
-import cn.quantgroup.cashloanflowboss.api.log.model.Principal;
+import cn.quantgroup.cashloanflowboss.api.login.model.Principal;
 import cn.quantgroup.cashloanflowboss.api.role.entity.Role;
 import cn.quantgroup.cashloanflowboss.component.security.Authority;
 import cn.quantgroup.cashloanflowboss.component.security.SecurityHandler;

src/main/java/cn/quantgroup/cashloanflowboss/core/dictionary/ApplicationStatus.java

@@ -11,9 +11,9 @@ import lombok.Getter;
 @Getter
 public enum ApplicationStatus implements Status<ApplicationStatus> {
 
-    SUCCESS(200000, "Service request processing successful"),
+    SUCCESS(200000, "请求处理成功"),
 
-    FAILURE(500000, "Service request processing failure"),
+    FAILURE(500000, "请求处理失败"),
 
     INTERNAL_SERVICE_ERROR(500001, "内部服务错误"),
 

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/entity/ApplyRequestHistory.java

+package cn.quantgroup.cashloanflowboss.spi.clf.entity;
+
+import cn.quantgroup.cashloanflowboss.spi.clf.model.ApplyRequestApplyTypeEnum;
+import lombok.Data;
+import lombok.Getter;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * Created with suntao on 2018/5/24
+ */
+@Data
+@Entity
+@Table(name = "apply_request_history", catalog = "cash_loan_flow")
+public class ApplyRequestHistory {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "request_id")
+    private String requestId;
+
+    @Column(name = "phone_no")
+    private String phoneNo;
+
+    @Column(name = "user_id")
+    private Long userId;
+
+    @Column(name = "user_name")
+    private String userName;
+
+    @Column(name = "uuid")
+    private String uuid;
+
+    @Column(name = "id_no")
+    private String idNo;
+
+    @Column(name = "channel_id")
+    private Long channelId;
+
+    @Column(name = "product_id")
+    private String productId;
+
+    @Column(name = "is_success")
+    private Boolean isSuccess;
+
+    @Column(name = "description_value")
+    private String descriptionValue;
+
+    @Column(name = "description_detail")
+    private String descriptionDetail;
+
+    @Column(name = "id_type")
+    private int idType = 0;
+
+    @Column(name = "apply_type")
+    private ApplyRequestApplyTypeEnum applyType;
+
+    @Column(name = "request_type")
+    private int requestType;
+
+    @Column(name = "md5")
+    private String md5;
+
+    @Column(name = "channel_order_no")
+    private String channelOrderNo;
+
+    @Column(name = "order_mapping_id")
+    private Long orderMappingId;
+
+    @Column(name = "ext_data")
+    private String extData;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt = new Timestamp(System.currentTimeMillis());
+
+
+    public enum ApplyRequestTypeEnum {
+        IN,
+        FAIL,
+        SUCC
+    }
+
+    @Getter
+    public enum DescriptionValueEnum {
+
+        phone_idNo_mismatching("0002"),// 手机号 对应身份证与库存不匹配
+        credit_30_day_refuse("1003"),// 30/35天内被拒绝过
+        has_credit_apply("0004"),//, msg："已有授信订单"
+        crediting("0006"),//, msg："授信处理中"
+        approving("0007"),//, msg："系统审核中"
+        account_exsit("0008");//, msg："已有额度"
+
+        private String value;
+        private DescriptionValueEnum(String value) {
+            this.value = value;
+        }
+    }
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/entity/CallbackFailRecord.java

+package cn.quantgroup.cashloanflowboss.spi.clf.entity;
+
+import cn.quantgroup.cashloanflowboss.spi.clf.model.CallbackRouter;
+import cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType;
+import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * @author zhangbin
+ * @date 2018/4/10.
+ */
+@Data
+@Entity
+@Table(name = "callback_fail_record",catalog = "cash_loan_flow")
+public class CallbackFailRecord {
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "apply_no")
+    private String applyNo;
+
+    @Column(name = "loan_id")
+    private Long loanId;
+
+    @Column(name = "progress")
+    private LoanProgress progress;
+
+    @Column(name = "term_no")
+    private Long termNo;
+
+    @Column(name = "notice_type")
+    private KANoticeType noticeType;
+
+    @Column(name = "callback_status")
+    private Integer callbackStatus;
+
+    @Column(name = "channel_id")
+    private Long channelId;
+
+    @Column(name = "retry_times")
+    private Integer retryTimes;
+
+    @Column(name = "fail_code")
+    private Integer failCode;
+
+    @Column(name = "loan_type")
+    private CallbackRouter callbackRouter;
+
+    /**
+     * 默认有效
+     */
+    @Column(name = "is_active")
+    private Boolean isActive = Boolean.TRUE;
+
+    /**
+     * mq 数据不能保存在fail 表字段中的数据，每个渠道结构不一样，每种mq-notifyType 不一样
+     */
+    @Column(name = "exdata")
+    private String exdata;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt = new Timestamp(System.currentTimeMillis());
+
+    @Column(name = "updated_at")
+    private Timestamp updatedAt = new Timestamp(System.currentTimeMillis());
+
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/entity/CallbackRecord.java

+package cn.quantgroup.cashloanflowboss.spi.clf.entity;
+
+import cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType;
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+import java.time.Instant;
+
+/**
+ * @author zhangbin
+ * @date 2018/4/10.
+ */
+@Data
+@Entity
+@Table(name = "callback_record", catalog = "cash_loan_flow")
+public class CallbackRecord {
+
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    /**
+     * 量化派授信订单号，申请订单号
+     */
+    @Column(name = "apply_no")
+    private String applyNo;
+    /**
+     * xyqb.loan_application_history.id
+     */
+    @Column(name = "loan_id")
+    private Long loanId;
+    /**
+     * 还款计划期数
+     */
+    @Column(name = "term_no")
+    private Long termNo;
+    /**
+     * 渠道订单标识
+     */
+    @Column(name = "channel_id")
+    private Long channelId;
+    /**
+     * 映射成渠道推送状态
+     */
+    @Column(name = "callback_status")
+    private Integer callbackStatus;
+    /**
+     * 事件
+     */
+    @Column(name = "notice_type")
+    private KANoticeType noticeType;
+    /**
+     * 成功次数
+     */
+    @Column(name = "success_times")
+    private Long successTimes;
+
+    @Column(name = "is_active")
+    private Boolean isActive;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt = Timestamp.from(Instant.now());
+
+    @Column(name = "updated_at")
+    private Timestamp updatedAt = Timestamp.from(Instant.now());
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/entity/WithdrawRecord.java

+package cn.quantgroup.cashloanflowboss.spi.clf.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.sql.Timestamp;
+
+/**
+ * Created with suntao on 2018/5/24
+ */
+@Data
+@Entity
+@Table(name = "withdraw_record", catalog = "cash_loan_flow")
+public class WithdrawRecord {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "request_id")
+    private String requestId;
+
+    @Column(name = "user_id")
+    private Long userId;
+
+    @Column(name = "channel_id")
+    private Long channelId;
+
+    @Column(name = "channel_order_no")
+    private String channelOrderNo;
+
+    @Column(name = "is_success")
+    private Boolean isSuccess;
+
+    @Column(name = "description_value")
+    private String descriptionValue;
+
+    @Column(name = "description_detail")
+    private String descriptionDetail;
+
+    @Column(name = "param_info")
+    private String paramInfo;
+
+    @Column(name = "ext_data")
+    private String extData;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt = new Timestamp(System.currentTimeMillis());
+
+
+}

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

+package cn.quantgroup.cashloanflowboss.spi.clf.model;
+
+/**
+ * function:
+ * date: 2019/9/4
+ *
+ * @author: suntao
+ */
+public enum ApplyRequestApplyTypeEnum {
+    APPLY_PRETRIAL("预审"),
+    APPLY("进件"),
+    ADD_INFO("补充信息"),
+    BIND_CARD("绑卡"),
+    WITHDRAW("绑卡提现");
+
+    private ApplyRequestApplyTypeEnum(String desc) {
+        this.desc = desc;
+    }
+
+    private String desc;
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public ApplyRequestApplyTypeEnum getByOrdinal(int ordinal) {
+        return ApplyRequestApplyTypeEnum.values()[ordinal];
+    }
+}

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

+package cn.quantgroup.cashloanflowboss.spi.clf.model;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhangbin
+ * @date 2018/4/10.
+ */
+@Data
+public class CallbackRecordVoModel {
+    private static final long serialVersionUID = -1L;
+
+    private Long id;
+
+    private String channelOrderNo;
+
+    private String applyNo;
+
+    private Long loanId;
+
+    private LoanProgress progress;
+
+    private Long termNo;
+
+    private KANoticeType noticeType;
+
+    private Integer callbackStatus;
+
+    private Long channelId;
+
+    private Integer retryTimes;
+
+    private Integer failCode;
+
+    private CallbackRouter callbackRouter;
+
+    /**
+     * 默认有效
+     */
+    private Boolean isActive = Boolean.TRUE;
+
+    /**
+     * mq 数据不能保存在fail 表字段中的数据，每个渠道结构不一样，每种mq-notifyType 不一样
+     */
+    private String exdata;
+
+    private Date createdAt;
+
+    private Date updatedAt;
+
+    private String tableName;
+
+}

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

@@ -14,9 +14,8 @@ public enum LoanProgress {
      */
     USERINFO_INCOMPLETE("用户未填写个人信息"),//0
     USER_INFORMATION_INCOMPLETE("用户未填写贷款信息"),//1
-
     USER_AUTHENTICATION_INCOMPLETE("用户授权信息未全部完成"),//2
-    USER_AUTHENTICATION_COMPLETE("授权状态完成"),//3
+    USER_AUTHENTICATION_COMPLETE("授权信息完成"),//3
     FURTHER_INFORMATION_INCOMPLETE("用户补充资料未完成"),//4
     PRE_SCREENING("初审中"),//5
     PRE_SCREENING_REJECT("初审拒绝"),//6
@@ -33,10 +32,11 @@ public enum LoanProgress {
     FILTERED_BY_BLACKLIST("黑名单过滤"),//17
     FINAL_SCREENING_PASSED("后台终审通过"),//18
     FILTERING_DECLINED("未通过初筛"),//19
-    WAITING_FUND("等待资金方放款"),// 20
-    FINAL_SEND_TO_MASHANG_BEFORE_APPROVAL("已发送给马上金融, 等待放款"),//21, 发邮件后更新使用
-    FINAL_MASHANG_APPROVAL_SUCCESS("马上金融放款成功"),//22
-    FINAL_FUNDED_APPROVAL_FAIL("马上金融放款失败"),//23,
+    /* 资金方相关 */
+    WAITING_FUND("等待马上金融放款"),// 20
+    FINAL_SENDED_TO_FUNDING_CORP("已发送给马上金融, 等待放款"),//21
+    FINAL_FUNDED_APPROVAL_SUCCESS("马上金融放款成功"),//22
+    FINAL_FUNDED_APPROVAL_FAIL("马上金融放款失败"),//23
     ADDRESS_COMPLETE("地址填写完毕，去绑卡"), // 24
 
     BEIYIN_USERINFO_INCOMPLETE("北银消费-用户未填写个人信息"),//25
@@ -55,55 +55,48 @@ public enum LoanProgress {
     BAITIAO_BIND_CARD("白条-绑卡"),//37
     BAITIAO_BIND_CARD_ING("白条-绑卡中"),//38
     BAITIAO_ACTIVATE_SUCC("白条-激活成功"),//39
-
-    /**
-     * 修改时间 20160104 资金方解耦
-     */
-    // category 4x
-    /* 易联校验/代收订单 异步通知重构 */
-    BIND_BANKCARD_IN_PROGRESS("绑卡处理中"),//40
-    /*REPAY_ORDER_IN_PROGRESS("还款处理中")*/
-    USER_RELATION_INCOMPLETE("与用户相关联系人信息未完成"),//41,
-    PLACE_HOLDER_42("占位"),PLACE_HOLDER_43("占位"),PLACE_HOLDER_44("占位"),
-    PLACE_HOLDER_45("占位"),PLACE_HOLDER_46("占位"),PING_AN_PAGE("跳转平安填写信息页面"),// 47
-    DROP_SUCC("取消借款"),//48
+    SUBMITED_TO_FUND_CORP_PRE_ASSIGN("提交资金方预审"), // 40
+
+    USER_RELATION_INCOMPLETE("与用户相关联系人信息未完成"),//41
+    FUND_ERROR("资金方事故，多次放款，汇聚到1渠道去还款"), //42
+    XIAOYING_BIND_CARD("小赢需要绑卡一下"), // 43
+    XIAOYING_VERIFY_CARD("小赢需要验证卡"), // 44
+    XIAOYING_BIND_CARD_POLL_RECHARGE_RESULT("小赢绑卡轮询结果"), // 45
+    // 46
+    BUY_ACCELERATE_CARD("需购买加速卡"), PING_AN_PAGE("跳转平安填写信息页面"), DROP_SUCC("取消借款"),//48
     PLACE_HOLDER_49("占位"),
 
     // category 5x
-    PLACE_HOLDER_50("占位"),PLACE_HOLDER_51("占位"),PLACE_HOLDER_52("占位"),PLACE_HOLDER_53("占位"),PLACE_HOLDER_54("占位"),
-    PLACE_HOLDER_55("占位"),PLACE_HOLDER_56("占位"),PLACE_HOLDER_57("占位"),PLACE_HOLDER_58("占位"),PLACE_HOLDER_59("占位"),
+    START_ORDER("发起提现,等待二次风控审核"), PLACE_HOLDER_51("占位"), SPEED_EXIST("极速APP存在订单"), PLACE_HOLDER_53("占位"), PLACE_HOLDER_54("占位"),
+    PLACE_HOLDER_55("占位"), PLACE_HOLDER_56("占位"), PLACE_HOLDER_57("占位"), PLACE_HOLDER_58("占位"), PLACE_HOLDER_59("占位"),
 
     // category 6x
-    PLACE_HOLDER_60("占位"),PLACE_HOLDER_61("占位"),PLACE_HOLDER_62("占位"),PLACE_HOLDER_63("占位"),PLACE_HOLDER_64("占位"),
-    WAITING_WITHDRAW("待存管提现"),// 65
-    PLACE_HOLDER_66("占位"),PLACE_HOLDER_67("占位"),PLACE_HOLDER_68("占位"),PLACE_HOLDER_69("占位"),
+    WAITING_USE("等待提现"), WAITING_USE_2("等待提现,直接跳转到提现页"), WAITING_USE_BY_SPEED("极速APP提现页面"), PLACE_HOLDER_63("占位"), PLACE_HOLDER_64("占位"),
+    WAITING_WITHDRAW("等待二次(存管)提现"), PLACE_HOLDER_66("占位"), PLACE_HOLDER_67("占位"), PLACE_HOLDER_68("占位"), PLACE_HOLDER_69("占位"),
 
     // category 7x
-    PLACE_HOLDER_70("占位"),PLACE_HOLDER_71("占位"),PLACE_HOLDER_72("占位"),PLACE_HOLDER_73("占位"),PLACE_HOLDER_74("占位"),
-    PLACE_HOLDER_75("占位"),PLACE_HOLDER_76("占位"),PLACE_HOLDER_77("占位"),PLACE_HOLDER_78("占位"),PLACE_HOLDER_79("占位"),
+    PLACE_HOLDER_70("占位"), PLACE_HOLDER_71("占位"), PLACE_HOLDER_72("占位"), PLACE_HOLDER_73("占位"), PLACE_HOLDER_74("占位"),
+    PLACE_HOLDER_75("占位"), PLACE_HOLDER_76("占位"), PLACE_HOLDER_77("占位"), PLACE_HOLDER_78("占位"), PLACE_HOLDER_79("占位"),
 
     // category 8x
-    PLACE_HOLDER_80("占位"),PLACE_HOLDER_81("占位"),PLACE_HOLDER_82("占位"),PLACE_HOLDER_83("占位"),PLACE_HOLDER_84("占位"),
-    PLACE_HOLDER_85("占位"),PLACE_HOLDER_86("占位"),PLACE_HOLDER_87("占位"),PLACE_HOLDER_88("占位"),PLACE_HOLDER_89("占位"),
+    PLACE_HOLDER_80("占位"), PLACE_HOLDER_81("占位"), PLACE_HOLDER_82("占位"), PLACE_HOLDER_83("占位"), PLACE_HOLDER_84("占位"),
+    PLACE_HOLDER_85("占位"), PLACE_HOLDER_86("占位"), PLACE_HOLDER_87("占位"), PLACE_HOLDER_88("占位"), PLACE_HOLDER_89("占位"),
 
     // category 9x
-    PLACE_HOLDER_90("占位"),PLACE_HOLDER_91("占位"),PLACE_HOLDER_92("占位"),PLACE_HOLDER_93("占位"),PLACE_HOLDER_94("占位"),
-    PLACE_HOLDER_95("占位"),PLACE_HOLDER_96("占位"),PLACE_HOLDER_97("占位"),PLACE_HOLDER_98("占位"),PLACE_HOLDER_99("占位"),
+    PLACE_HOLDER_90("占位"), PLACE_HOLDER_91("占位"), PLACE_HOLDER_92("占位"), PLACE_HOLDER_93("占位"), PLACE_HOLDER_94("占位"),
+    PLACE_HOLDER_95("占位"), PLACE_HOLDER_96("占位"), PLACE_HOLDER_97("占位"), PLACE_HOLDER_98("占位"), PLACE_HOLDER_99("占位"),
 
-    /**
-     * 资金方相关
-     */
-    // 等待资金方放款 : 100
-    WAITING_MASHANG_FUND("等待马上金融放款"),// 100, 发邮件前查询使用
-    // 已提交给资金方等待放款 : 101
-    SENDED_TO_FUND_CORP("已提交给资金方"),
     // category 10x
-    PLACE_HOLDER_102("占位"),PLACE_HOLDER_103("占位"),PLACE_HOLDER_104("占位"),PLACE_HOLDER_105("占位"),PLACE_HOLDER_106("占位"),
-    PLACE_HOLDER_107("占位"),PLACE_HOLDER_108("占位"),PLACE_HOLDER_109("占位"),
+    PLACE_HOLDER_100("占位"), PLACE_HOLDER_101("占位"), PLACE_HOLDER_102("占位"), PLACE_HOLDER_103("占位"), PLACE_HOLDER_104("占位"),
+    PLACE_HOLDER_105("占位"), PLACE_HOLDER_106("占位"), PLACE_HOLDER_107("占位"), PLACE_HOLDER_108("占位"), PLACE_HOLDER_109("占位"),
 
-    JD_BANDCARD_FAIL("京东绑卡失败")//110 京东绑卡失败状态
-    ;
+    // category 11x
+    JD_BANDCARD_FAIL("京东绑卡失败"), PLACE_HOLDER_111("占位"), PLACE_HOLDER_112("占位"), PLACE_HOLDER_113("占位"), PLACE_HOLDER_114("占位"),
+    PLACE_HOLDER_115("占位"), PLACE_HOLDER_116("占位"), PLACE_HOLDER_117("占位"), PLACE_HOLDER_118("占位"), PLACE_HOLDER_119("占位"),
 
+    // cash_loan_flow生成的订单禁止进入xyqb操作状态 12x
+    REFUSE_JD("拒绝京东订单进入xyqb"), PLACE_HOLDER_121("占位"), PLACE_HOLDER_122("占位"), PLACE_HOLDER_123("占位"), PLACE_HOLDER_124("占位"),
+    PLACE_HOLDER_125("占位"), PLACE_HOLDER_126("占位"), PLACE_HOLDER_127("占位"), PLACE_HOLDER_128("占位"), PLACE_HOLDER_129("占位");
 
     private String description;
 
@@ -126,19 +119,17 @@ public enum LoanProgress {
 
     /**
      * 获取审核拒绝状态
-     * @return
      */
-    public static Set<LoanProgress> getCheckReject(){
+    public static Set<LoanProgress> getCheckReject() {
         return Sets.newHashSet(LoanProgress.FILTERING_DECLINED, LoanProgress.PRE_SCREENING_REJECT,
                 LoanProgress.FINAL_SCREENING_REJECT, LoanProgress.FILTERED_BY_BLACKLIST);
     }
 
-    /**
-     * 获取推送订单状态
-     * @return
-     */
-    public static Set<LoanProgress> getFeedBackOrderStatus(){
-        return Sets.newHashSet(LoanProgress.WAITING_FUND, LoanProgress.FINAL_SEND_TO_MASHANG_BEFORE_APPROVAL,
-                LoanProgress.FINAL_FUNDED_APPROVAL_FAIL, LoanProgress.CHECK_REPAYMENT_PLAN, LoanProgress.LOAN_COMPLETE);
+    public static LoanProgress valueOfByOrdinal(int ordinal) {
+        try {
+            return LoanProgress.values()[ordinal];
+        } catch (Exception e) {
+            return null;
+        }
     }
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/repository/ApplyRequestHistoryRepository.java

+package cn.quantgroup.cashloanflowboss.spi.clf.repository;
+
+import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowDataSource;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.ApplyRequestHistory;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+import org.springframework.stereotype.Repository;
+
+
+@CashLoanFlowDataSource
+@Repository
+public interface ApplyRequestHistoryRepository extends PagingAndSortingRepository<ApplyRequestHistory, Long>, JpaSpecificationExecutor<ApplyRequestHistory> {
+
+
+}
\ No newline at end of file

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/repository/CallbackFailRecordRepository.java

+package cn.quantgroup.cashloanflowboss.spi.clf.repository;
+
+import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowDataSource;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackFailRecord;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * function:
+ * date: 2019/9/3
+ *
+ * @author: suntao
+ */
+@CashLoanFlowDataSource
+@Repository
+public interface CallbackFailRecordRepository extends JpaRepository<CallbackFailRecord, Long> {
+
+    List<CallbackFailRecord> findByApplyNo(String applyNo);
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/repository/CallbackRecordRepository.java

+package cn.quantgroup.cashloanflowboss.spi.clf.repository;
+
+import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowDataSource;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.CallbackRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * function:
+ * date: 2019/9/3
+ *
+ * @author: suntao
+ */
+@CashLoanFlowDataSource
+@Repository
+public interface CallbackRecordRepository extends JpaRepository<CallbackRecord, Long> {
+
+    List<CallbackRecord> findByApplyNo(String applyNo);
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/repository/ClfOrderCallbackRepository.java

@@ -3,6 +3,7 @@ package cn.quantgroup.cashloanflowboss.spi.clf.repository;
 import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowDataSource;
 import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderCallBack;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -14,4 +15,8 @@ import org.springframework.stereotype.Repository;
 @CashLoanFlowDataSource
 @Repository
 public interface ClfOrderCallbackRepository extends JpaRepository<ClfOrderCallBack, Long> {
+
+    @Query(value = "select * from order_callback where callback_status = ?1 and registered_from = ?2", nativeQuery = true)
+    ClfOrderCallBack findByCallbackStatusAndRegisteredFrom(String callbackState, Long channelId);
+
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/clf/repository/WithdrawRecordRepository.java

+package cn.quantgroup.cashloanflowboss.spi.clf.repository;
+
+import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowDataSource;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.WithdrawRecord;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+/**
+ * Created with suntao on 2018/6/4
+ */
+@CashLoanFlowDataSource
+public interface WithdrawRecordRepository extends JpaRepository<WithdrawRecord, Long> {
+
+
+    @Query(value = "select * from withdraw_record where channel_order_no=?1 and channel_id=?2", nativeQuery = true)
+    List<WithdrawRecord> findByChannelOrderNoAndChannelId(String channelOrderNo, Long channelId);
+}

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

@@ -20,4 +20,6 @@ public interface CLFCenter {
       return ;
     }
   }
+
+
 }

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

+package cn.quantgroup.cashloanflowboss.spi.clf.service;
+
+import cn.quantgroup.cashloanflowboss.api.order.model.OrderBaseModel;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.*;
+import org.springframework.data.domain.Page;
+import java.util.List;
+
+/**
+ * function:
+ * date: 2019/9/16
+ *
+ * @author: suntao
+ */
+public interface CLFCenterService {
+
+    List<CallbackFailRecord> findCallbackFailRecordByApplyNo(String applyNo);
+
+    List<CallbackRecord> findCallbackRecordByApplyNo(String applyNo);
+
+    ClfOrderMapping findOrderMappingByChannelOrderNo(String channelOrderNumber);
+
+    List<WithdrawRecord> findWithdrawRecordList(String channelOrderNumber, Long channelId);
+
+    List<ApplyRequestHistory> findApplyRequestHistoryBySpecification(OrderBaseModel orderBaseModel);
+
+    Page<ClfChannelConfiguration> findChannelConfigurationByCriteriaQueryPage(Integer pageNumber, Integer pageSize, Long channelId);
+
+    ClfChannelConfiguration findChannelConfigurationByChannelId(Long channelId);
+
+    void saveChannelConfiguration(ClfChannelConfiguration channelConfiguration);
+
+    void saveCallbackConfiguration(ClfCallbackConfiguration clfCallbackConfiguration);
+
+    void saveOrderCall(List<ClfOrderCallBack> clfOrderCallBackList);
+
+    ClfOrderCallBack findOrderCallBackByByCallbackStatusAndChannelId(String name, Long channelId);
+}

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

+package cn.quantgroup.cashloanflowboss.spi.clf.service;
+
+import cn.quantgroup.cashloanflowboss.api.order.model.OrderBaseModel;
+import cn.quantgroup.cashloanflowboss.spi.clf.entity.*;
+import cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType;
+import cn.quantgroup.cashloanflowboss.spi.clf.repository.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.stereotype.Service;
+
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * function:
+ * date: 2019/9/3
+ *
+ * @author: suntao
+ */
+@Service
+public class CLFCenterServiceImpl implements CLFCenterService{
+
+
+    @Autowired
+    private CallbackFailRecordRepository callbackFailRecordRepository;
+    @Autowired
+    private CallbackRecordRepository callbackRecordRepository;
+    @Autowired
+    private ClfOrderMappingRepository orderMappingRepository;
+    @Autowired
+    private ClfChannelConfigurationRepository clfChannelConfigurationRepository;
+    @Autowired
+    private ClfCallbackConfigurationRepository clfCallbackConfigurationRepository;
+    @Autowired
+    private ApplyRequestHistoryRepository applyRequestHistoryRepository;
+    @Autowired
+    private WithdrawRecordRepository withdrawRecordRepository;
+    @Autowired
+    private ClfOrderCallbackRepository clfOrderCallbackRepository;
+
+
+
+    @Override
+    public List<CallbackFailRecord> findCallbackFailRecordByApplyNo(String applyNo) {
+        return callbackFailRecordRepository.findByApplyNo(applyNo);
+    }
+
+    @Override
+    public List<CallbackRecord> findCallbackRecordByApplyNo(String applyNo) {
+        return callbackRecordRepository.findByApplyNo(applyNo);
+    }
+
+    @Override
+    public ClfOrderMapping findOrderMappingByChannelOrderNo(String channelOrderNumber) {
+        return orderMappingRepository.findByChannelOrderNoLastOne(channelOrderNumber);
+    }
+
+    @Override
+    public List<WithdrawRecord> findWithdrawRecordList(String channelOrderNumber, Long channelId) {
+        return withdrawRecordRepository.findByChannelOrderNoAndChannelId(channelOrderNumber, channelId);
+    }
+
+    @Override
+    public List<ApplyRequestHistory> findApplyRequestHistoryBySpecification(OrderBaseModel orderBaseModel) {
+        List<ApplyRequestHistory> all = applyRequestHistoryRepository.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> predicates = new ArrayList<>();
+
+            // 指定渠道号
+            if (Objects.nonNull(orderBaseModel.getChannelId())) {
+                predicates.add(criteriaBuilder.equal(root.get("channelId"), orderBaseModel.getChannelId().longValue()));
+            }
+            if (StringUtils.isNotEmpty(orderBaseModel.getChannelOrderNumber())) {
+                predicates.add(criteriaBuilder.equal(root.get("channelOrderNo"), orderBaseModel.getChannelOrderNumber()));
+            }
+
+            // 设置查询条件
+            criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
+            // 指定排序
+            criteriaQuery.orderBy(criteriaBuilder.desc(root.get("id")));
+
+            return criteriaQuery.getRestriction();
+        }));
+        return all;
+    }
+
+    @Override
+    public Page<ClfChannelConfiguration> findChannelConfigurationByCriteriaQueryPage(Integer pageNumber, Integer pageSize, Long channelId) {
+        return clfChannelConfigurationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> {
+
+            List<Predicate> predicates = new ArrayList<>();
+
+            // 指定渠道号
+            if (Objects.nonNull(channelId)) {
+                predicates.add(criteriaBuilder.equal(root.get("registeredFrom"), channelId.longValue()));
+            }
+
+            // 设置查询条件
+            criteriaQuery.where(criteriaBuilder.and(predicates.toArray(new Predicate[predicates.size()])));
+            // 指定排序
+            criteriaQuery.orderBy(criteriaBuilder.desc(root.get("id")));
+
+            return criteriaQuery.getRestriction();
+
+        }, new PageRequest(pageNumber, pageSize));
+    }
+
+    @Override
+    public ClfChannelConfiguration findChannelConfigurationByChannelId(Long channelId) {
+        return clfChannelConfigurationRepository.findByRegisteredFrom(channelId);
+    }
+
+    @Override
+    public void saveChannelConfiguration(ClfChannelConfiguration channelConfiguration) {
+        clfChannelConfigurationRepository.save(channelConfiguration);
+    }
+
+    @Override
+    public void saveCallbackConfiguration(ClfCallbackConfiguration clfCallbackConfiguration) {
+        clfCallbackConfigurationRepository.save(clfCallbackConfiguration);
+    }
+
+    @Override
+    public void saveOrderCall(List<ClfOrderCallBack> clfOrderCallBackList) {
+        clfOrderCallbackRepository.save(clfOrderCallBackList);
+    }
+
+    @Override
+    public ClfOrderCallBack findOrderCallBackByByCallbackStatusAndChannelId(String kaNoticeName, Long channelId) {
+        return clfOrderCallbackRepository.findByCallbackStatusAndRegisteredFrom(kaNoticeName, channelId);
+    }
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/clotho/client/ClothoCenter.java

@@ -24,6 +24,9 @@ public interface ClothoCenter {
     @PostMapping(value = "/external/quota/auth_amount_audit/notify", consumes = "application/x-www-form-urlencoded")
     String approve(@RequestParam Map approveData);
 
+    @PostMapping(value = "/external/quota/order_audit/notify", consumes = "application/x-www-form-urlencoded")
+    String orderAuditNotify(@RequestParam Map notify);
+
     /**
      * 生成放款MQ消息
      *
@@ -68,6 +71,11 @@ public interface ClothoCenter {
             return "error1";
         }
 
+        @Override
+        public String orderAuditNotify(Map notify) {
+            return null;
+        }
+
         @Override
         public String generatorLendingMessage(Map data) {
             throw new ClothoCenterException();

src/main/java/cn/quantgroup/cashloanflowboss/spi/clotho/service/ClothoCenterService.java

 package cn.quantgroup.cashloanflowboss.spi.clotho.service;
 
+import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.spi.clotho.client.ClothoCenter;
 import cn.quantgroup.cashloanflowboss.spi.clotho.model.LendingServiceModel;
 import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by WeiWei on 2019/8/12.
@@ -20,6 +24,20 @@ public class ClothoCenterService {
     @Autowired
     private ClothoCenter clothoCenter;
 
+
+    public Boolean orderAuditNotify(String uuid, Long loanId, boolean auditResult, int bizType) {
+        Map notify = new HashMap();
+        notify.put("code", 0);
+        notify.put("msg", "success");
+        notify.put("bizChannel", 1);
+        notify.put("uuid", uuid);
+        notify.put("bizNo", loanId);
+        notify.put("bizType", bizType);
+        notify.put("auditResult", auditResult);
+        return "success".equals(clothoCenter.orderAuditNotify(notify));
+    }
+
+
     /**
      * 生成放款MQ消息
      *
@@ -36,16 +54,48 @@ public class ClothoCenterService {
      */
     public boolean lending(Integer fundId, BigDecimal amountLimit, Integer pepoleLimit) {
 
-        // TODO WEIWEI 根据返回的数据结构补充判断逻辑
-
-        String data = this.clothoCenter.lending(new HashMap() {{
+        if (Application.isDebug()) {
+            String data = this.clothoCenter.lending(new HashMap(4) {{
                 put("fundingCorpId", fundId);
                 put("amountLimit", amountLimit);
                 put("peopleLimit", pepoleLimit);
             }});
 
+            return "success".equals(data);
+        } else {
             return false;
+        }
+
+    }
 
+
+    /**
+     * 审批
+     * @param approveData
+     * @return
+     */
+    public String approve(Map<String, Object> approveData) {
+        if (Application.isDebug()) {
+            return clothoCenter.approve(approveData);
+        } else {
+            return "error";
+        }
+    }
+
+    public String cancelPreLoan(Map<Object, Object> data) {
+        if (Application.isDebug()) {
+            return clothoCenter.cancelPreLoan(data);
+        } else {
+            return "error";
+        }
+    }
+
+    public String cancelAfterLoan(Map<Object, Object> data) {
+        if (Application.isDebug()) {
+            return clothoCenter.cancelAfterLoan(data);
+        } else {
+            return "error";
+        }
     }
 
 }

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

@@ -8,14 +8,16 @@ import org.springframework.web.bind.annotation.RequestParam;
 @Component
 @FeignClient(name = "JolyneServiceCenter", url = "http://192.168.4.156:9001/executeSQL/{{NAMESPACE}}", fallback = JolyneCenter.Fallback.class)
 public interface JolyneCenter {
+
+
     @PostMapping(value = "/xyqb", consumes = "application/json")
-  String cancel(@RequestParam("json") String cancelData);
+    String sqlXyqb(@RequestParam("json") String cancelData);
 
     @Component
     class Fallback implements JolyneCenter {
 
         @Override
-    public String cancel(String cancelData) {
+        public String sqlXyqb(String cancelData) {
             return null;
         }
     }

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

+package cn.quantgroup.cashloanflowboss.spi.jolyne;
+
+import cn.quantgroup.cashloanflowboss.utils.JSONTools;
+import com.google.common.collect.Maps;
+
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * function:
+ * date: 2019/9/12
+ *
+ * @author: suntao
+ */
+public class JolyneUtil {
+
+    public static String getJolneSql(List<String> slqList) {
+
+        ConcurrentMap<String, Object> data = Maps.newConcurrentMap();
+        data.put("sql", slqList);
+        return JSONTools.serialize(data);
+    }
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/paycenter/client/PayCenter.java

+package cn.quantgroup.cashloanflowboss.spi.paycenter.client;
+
+import cn.quantgroup.cashloanflowboss.spi.xyqb.client.XYQBCenter;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * function:
+ * date: 2019/9/2
+ *
+ * @author: suntao
+ */
+//@Component
+//@FeignClient(name = "PayCenter", url = "${api.https}", fallback = XYQBCenter.Fallback.class)
+public class PayCenter {
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/paycenter/service/PayCenterService.java

+package cn.quantgroup.cashloanflowboss.spi.paycenter.service;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * function:
+ * date: 2019/9/2
+ *
+ * @author: suntao
+ */
+@Service
+public class PayCenterService {
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/user/service/XyqbUserServiceImpl.java

 package cn.quantgroup.cashloanflowboss.spi.user.service;
 
-import cn.quantgroup.cashloanflowboss.api.order.model.OrderVo;
-import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
 import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneCenter;
 import cn.quantgroup.cashloanflowboss.spi.user.repository.UserDetailRepository;
 import cn.quantgroup.cashloanflowboss.spi.user.repository.UserExtInfoRepository;
@@ -19,7 +17,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.util.concurrent.ConcurrentMap;
-import lombok.extern.log4j.Log4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -181,7 +179,7 @@ public class XyqbUserServiceImpl implements XyqbUserService {
         cancel_list.add("delete from apply_quota_record where user_id="+userId);
         cancel_list.add("delete from user_operation_history where user_id="+userId);
         data.put("sql",cancel_list);
-        String cancel_result = jolyneCenter.cancel(JSONTools.serialize(data));
+        String cancel_result = jolyneCenter.sqlXyqb(JSONTools.serialize(data));
         return "success".equals(cancel_result);
     }
 

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/entity/Contract.java

@@ -26,6 +26,6 @@ public class Contract {
      * 状态
      */
     @Column(name = "generate_status")
-    private Integer generate_status;
+    private Integer generateStatus;
 
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/entity/FundLending.java

-package cn.quantgroup.cashloanflowboss.spi.xyqb.entity;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * Created by WeiWei on 2019/8/12.
- */
-@Data
-@Entity
-@Table(name = "waiting_funding_corp_operate_people")
-public class FundLending {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-
-    /**
-     * 借款订单号
-     */
-    @Column(name = "loan_application_history_id")
-    private String loanId;
-
-    /**
-     * 放款金额
-     */
-    @Column(name = "fund_amount")
-    private BigDecimal amount;
-
-    /**
-     * 资方ID
-     */
-    @Column(name = "funding_corp_id")
-    private Integer fundId;
-
-    /**
-     * 进度
-     */
-    @Column(name = "funding_corp_progress")
-    private Integer progress;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "created_at")
-    private Date createTime;
-
-}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/entity/FundingAssetAllocationsPrograms.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 资产分配记录表
+ */
+@Data
+@Entity
+@Table(name = "funding_asset_allocations_programs")
+public class FundingAssetAllocationsPrograms {
+
+
+  @Id
+  @Column(name = "id")
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  /**
+   * 资金方ID
+   */
+  @Column(name = "fund_corp_id")
+  private Long fundCorpId;
+
+
+  /**
+   * 计划日期
+   */
+  @Column(name = "plan_date")
+  private Date planDate;
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/entity/FundingCorpPolicy.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.entity;
+
+import lombok.Data;
+
+import javax.persistence.*;
+
+/**
+ * 资产分配记录表
+ */
+@Data
+@Entity
+@Table(name = "funding_corp_policy")
+public class FundingCorpPolicy {
+
+  /**
+   * 资方id
+   */
+  @Id
+  @Column(name = "funding_corp_id")
+  private Long fundingCorpId;
+
+
+  /**
+   * 是否启用自动分配
+   */
+  @Column(name = "is_auto_assign")
+  private Boolean isAutoAssign;
+
+  /**
+   * 是否启动自动拉取分配结果
+   */
+  @Column(name = "is_auto_fetch")
+  private Boolean isAutoFetch;
+
+  /**
+   * 是否启用自动推送放款
+   */
+  @Column(name = "is_auto_loan")
+  private Boolean isAutoLoan;
+
+  /**
+   * 是否启动自动拉取放款结果
+   */
+  @Column(name = "is_auto_loan_fetch")
+  private Boolean isAutoLoanFetch;
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/entity/LoanApplicationHistory.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.entity;
+
+import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Objects;
+
+/**
+ * Created by FrankChow on 15/7/8.
+ * 贷款记录表
+ */
+@Entity
+@Table(name = "loan_application_history")
+@Getter
+@Setter
+@ToString
+public class LoanApplicationHistory implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "user_id")
+    private Long userId;
+
+    @Column(name = "channel_id")
+    private Long channelId;
+
+    // false表示借款申请是无效的或者已完成
+    @Column(name = "is_active")
+    private Boolean isActive = true;
+
+    // 贷款进度 默认是02
+    @Column(name = "progress")
+    private LoanProgress progress = LoanProgress.USER_AUTHENTICATION_INCOMPLETE;
+
+    @Column(name = "bank_card_id")
+    private Long bankCardId;
+
+
+    // 从哪个渠道注册过来
+    @Column(name = "created_from")
+    private Long createdFrom;
+
+
+
+    @Column(name = "baitiao_merchant_id")
+    private Long baitiaoMerchantId = -1L;
+
+    // 上一次修改时间
+    @Column(name = "updated_at")
+    private Timestamp updatedAt;
+    // 上一次修改时间
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+    @PrePersist
+    public void prePersist() {
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        createdAt = timestamp;
+        updatedAt = timestamp;
+    }
+
+    @PreUpdate
+    public void preUpdate() {
+        updatedAt = new Timestamp(System.currentTimeMillis());
+    }
+
+
+    public long parseChannelId() {
+        return !Objects.equals(createdFrom, -1L) ? this.createdFrom : this.channelId;
+    }
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/entity/WaitingFundingCorpOperatePeople.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.entity;
+
+import cn.quantgroup.cashloanflowboss.spi.xyqb.model.FundingCorpProgress;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * Created by Miraculous on 16/4/11.
+ */
+@Entity
+@Getter
+@Setter
+@ToString
+@Table(name = "waiting_funding_corp_operate_people")
+public class WaitingFundingCorpOperatePeople implements Serializable {
+
+    private static final long serialVersionUID = -1L;
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    private Long id;
+
+    @Column (name = "loan_application_history_id")
+    private Long loanApplicationHistoryId;
+
+    @Column(name = "channel_id")
+    private Long channelId;
+
+    @Column(name = "fund_amount")
+    private BigDecimal fundAmount;
+
+    @Column(name = "funding_corp_progress")
+    private FundingCorpProgress fundingCorpProgress = FundingCorpProgress.WAITING_FUNDING_CORP_REVIEW;
+
+    @Column(name = "is_enable")
+    private Boolean isEnable;
+
+    @Column(name = "funding_corp_id")
+    private Long fundingCorpId;
+
+    @Column(name = "corp_loan_id")
+    private String corpLoanId;
+
+    @Column(name = "request_id")
+    private String requestId;
+
+    @Column(name = "created_at")
+    private Timestamp createdAt;
+
+
+    public enum FundStatus{
+        SUCC("SUCC","放款成功"),
+        FAIL("FAIL","放款失败"),
+        HANDING("HANDING","处理中"),
+        DEPOSITORY_SUCC("DEPOSITORY_SUCC","存管提现成功"),
+        DEPOSITORY_FAIL("DEPOSITORY_FAIL","存管提现失败"),
+        DEPOSITORY_HANDING("DEPOSITORY_HANDING","存管提现中");
+        private String status;
+        private String desc;
+
+        FundStatus(String status, String desc) {
+            this.status = status;
+            this.desc = desc;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+    }
+
+}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/model/FundingCorpProgress.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.model;
+
+/**
+ * Created by Miraculous on 16/4/11.
+ */
+public enum FundingCorpProgress {
+
+    WAITING_FUNDING_CORP_REVIEW("等待资金方审核"),
+    FUNDING_CORP_RESPONSE_ERROR("资金方审核通信失败"),
+    FUNDING_CORP_EMPTY_RESPONSE("资金方审核返回空结果"),
+    FUNDING_CORP_REVIEW_REJECT("资金方审核失败"),
+    FUNDING_CORP_AGREE("资金方同意放款"),
+    FUNDING_CORP_FUNDED("资金方已放款"),
+    FUNDING_CORP_FUNDED_FAIL("资金方放款失败"),
+    FUNDING_CORP_REVIEW_ERROR("资金方审核异常"),
+    FUNDING_CORP_REVIEW_8("888"),
+    FUNDING_CORP_REVIEW_FETCHING("正在获取资金方放款结果"),//已经使用
+    IN_LOAN_QUEUE("在放款队列中");//已经使用
+
+    String description;
+
+    FundingCorpProgress(String descrption) {
+        this.description = descrption;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("FundingCorpProgress{");
+        sb.append("description='").append(description).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
+}
\ No newline at end of file

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/model/OrderStatusQueryModel.java

-package cn.quantgroup.cashloanflowboss.spi.xyqb.model;
-
-import cn.quantgroup.cashloanflowboss.spi.clf.entity.ClfOrderMapping;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 查询订单状态 model
- * Created with suntao on 2018/12/26
- */
-@Data
-@NoArgsConstructor
-public class OrderStatusQueryModel {
-    /** APPROVE 时 非空,元 */
-    private String drawTryAmount;
-    /** APPROVE 时 非空,元 */
-    private String drawTryTerm;
-
-    private ClfOrderMapping orderMapping;
-
-    /** 可以为空 */
-    private QueryType queryType;
-
-    public OrderStatusQueryModel(ClfOrderMapping orderMapping) {
-        this.orderMapping = orderMapping;
-    }
-
-    public enum QueryType {
-        APPROVE("审批状态查询"),
-        WITHDRAW("提现状态查询，贷前提现"),
-        CANCEL_LOAN("取消借款"),
-        CANCEL_AFTER_LOAN("取消借款,贷后,退款"),
-        PAY("放款状态查询"),
-        ALL_REPAID("结清状态查询");
-
-        private String desc;
-        public String getDesc(){
-            return this.desc;
-        }
-        QueryType(String desc) {
-            this.desc = desc;
-        }
-    }
-}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/model/OrderStatusQueryResultOnlyStatus.java

-package cn.quantgroup.cashloanflowboss.spi.xyqb.model;
-
-import cn.quantgroup.cashloanflowboss.spi.clf.model.KANoticeType;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * Created with suntao on 2018/12/26
- */
-@Data
-public class OrderStatusQueryResultOnlyStatus {
-
-    private String applyNo;
-
-    private Long loanId;
-
-    private KANoticeType kaNoticeType;
-
-    private Date updateTime;
-
-}

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/ContractRepository.java

@@ -2,8 +2,9 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
 
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.Contract;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -11,7 +12,7 @@ import org.springframework.stereotype.Repository;
  */
 @XYQBDataSource
 @Repository
-public interface ContractRepository extends CrudRepository<Contract, Long> {
+public interface ContractRepository extends JpaRepository<Contract, Long> {
 
     /**
      * 更新合同状态
@@ -20,7 +21,11 @@ public interface ContractRepository extends CrudRepository<Contract, Long> {
      * @param status
      * @return
      */
-    @Query("update Contract set generate_status = :status where userId = :userId")
-    boolean updateContractStatus(Long userId, Integer status);
+    @Deprecated
+    @Modifying
+    @Query(value = "update contract set generate_status = ?2 where user_id = ?1", nativeQuery = true)
+    int updateContractStatus(Long userId, Integer status);
 
+    @Query(value = "select * from contract where user_id = ?1 order by id desc limit 1", nativeQuery = true)
+    Contract findByUserIdLastOne(Long qgUserId);
 }

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/FundingAssetAllocationsProgramsRepository.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
+
+import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FundingAssetAllocationsPrograms;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * 资产计划开关表
+ * Created by suntao 20190902
+ */
+@XYQBDataSource
+@Repository
+public interface FundingAssetAllocationsProgramsRepository extends CrudRepository<FundingAssetAllocationsPrograms, Integer> {
+
+
+
+    @Query(value = "select * from funding_asset_allocations_programs where fund_corp_id=?1 and plan_date = ?2 limit 1", nativeQuery = true)
+    FundingAssetAllocationsPrograms findByFundCorpIdAndPlanDate(Long fundCorpId, String planDate);
+
+
+}
\ No newline at end of file

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/FundingCorpPolicyRepository.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
+
+import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FundingCorpPolicy;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * 资产计划开关表
+ * Created by suntao 20190902
+ */
+@XYQBDataSource
+@Repository
+public interface FundingCorpPolicyRepository extends CrudRepository<FundingCorpPolicy, Integer> {
+
+    FundingCorpPolicy findByFundingCorpId(Long fundingCorpId);
+
+}
\ No newline at end of file

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/LoanApplicationHistoryRepository.java

+package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
+
+import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.LoanApplicationHistory;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+
+/**
+ * Created by WeiWei on 2019/8/12.
+ */
+@XYQBDataSource
+@Repository
+public interface LoanApplicationHistoryRepository extends CrudRepository<LoanApplicationHistory, Integer> {
+
+    LoanApplicationHistory findById(Long id);
+
+}
\ No newline at end of file

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/FundLendingRepository.java → src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/repository/WaitingFundingCorpOperatePeopleRepository.java

 package cn.quantgroup.cashloanflowboss.spi.xyqb.repository;
 
-import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FundLending;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.WaitingFundingCorpOperatePeople;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.source.XYQBDataSource;
+import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import java.util.Date;
 import java.util.Map;
 
 /**
@@ -15,26 +15,18 @@ import java.util.Map;
  */
 @XYQBDataSource
 @Repository
-public interface FundLendingRepository extends CrudRepository<FundLending, Integer> {
+public interface WaitingFundingCorpOperatePeopleRepository extends CrudRepository<WaitingFundingCorpOperatePeople, Long>, JpaRepository<WaitingFundingCorpOperatePeople, Long> {
 
-    /**
-     * 更新资方待放款创建时间
-     *
-     * @param loanId
-     * @param time
-     * @return
-     */
-    @Query("update FundLending set createTime = :createTime where loanId = :loanId")
-    boolean updateCreateTime(@Param("loanId") Long loanId, @Param("createTime") Date time);
 
     /**
      * 查询待放款记录
      *
      * @param fundId
-     * @param progress
      * @return
      */
-    @Query("select sum(amount) as totalAmount ,count(fundId) as totalCount from FundLending where progress = :progress and fundId = :fundId")
-    Map queryLendingRecordCount(Integer fundId, Integer progress);
+    @Query(value = "select sum(fund_amount) ,count(*) from xyqb.waiting_funding_corp_operate_people where funding_corp_progress=0  and funding_corp_id= ?1", nativeQuery = true)
+    Map queryLendingRecordCount(Long fundId);
+
+    WaitingFundingCorpOperatePeople findByLoanApplicationHistoryId(Long loanId);
 
 }
\ No newline at end of file

src/main/java/cn/quantgroup/cashloanflowboss/spi/xyqb/service/XYQBCenterService.java

@@ -2,43 +2,48 @@ package cn.quantgroup.cashloanflowboss.spi.xyqb.service;
 
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbCurrentOrderStatusServiceResultModel;
 import cn.quantgroup.cashloanflowboss.api.order.model.XyqbHistoryOrderStatusServiceResultModel;
-import cn.quantgroup.cashloanflowboss.core.base.Result;
+import cn.quantgroup.cashloanflowboss.core.Application;
 import cn.quantgroup.cashloanflowboss.core.base.ServiceResult;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.client.XYQBCenter;
-import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.ContractRepository;
-import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.FundLendingRepository;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.*;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.*;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.util.SignUtil;
+import cn.quantgroup.cashloanflowboss.utils.DateUtil;
+import cn.quantgroup.cashloanflowboss.utils.JSONTools;
 import com.google.common.collect.Maps;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Created by WeiWei on 2019/8/12.
  */
+@Slf4j
 @Service
 public class XYQBCenterService {
 
     @Autowired
-    private FundLendingRepository fundLendingRepository;
-
+    private WaitingFundingCorpOperatePeopleRepository waitingFundingCorpOperatePeopleRepository;
     @Autowired
     private ContractRepository contractRepository;
+    @Autowired
+    private CancelPreLoanRepository cancelPreLoanRepository;
+    @Autowired
+    private FundingCorpPolicyRepository fundingCorpPolicyRepository;
+    @Autowired
+    private FundingAssetAllocationsProgramsRepository fundingAssetAllocationsProgramsRepository;
+    @Autowired
+    private LoanApplicationHistoryRepository loanApplicationHistoryRepository;
+
 
     @Autowired
     private XYQBCenter xyqbCenter;
 
-    /**
-     * 更新资方待放款创建时间
-     *
-     * @return
-     */
-    public boolean updateFundLendingTime(Long loanId) {
-        return this.fundLendingRepository.updateCreateTime(loanId, new Date());
-    }
 
     /**
      * 更新合同状态
@@ -46,7 +51,7 @@ public class XYQBCenterService {
      * @param userId
      * @return
      */
-    public boolean updateContractStatus(Long userId, Integer status) {
+    public int updateContractStatus(Long userId, Integer status) {
         return this.contractRepository.updateContractStatus(userId, status);
     }
 
@@ -54,36 +59,97 @@ public class XYQBCenterService {
      * 查询放款记录
      *
      * @param fundId
-     * @param progress
      * @return
      */
-    public Map queryLendingRecordCount(Integer fundId, Integer progress) {
-        return this.fundLendingRepository.queryLendingRecordCount(fundId, progress);
+    public Map queryLendingRecordCount(Long fundId) {
+        return this.waitingFundingCorpOperatePeopleRepository.queryLendingRecordCount(fundId);
     }
 
+
     /**
-     * 生成放款结果MQ
-     *
-     * @param loanId
-     * @param status
+     * 贷前取消借款
+     * @param channelOrderNumber
+     * @return
+     */
+    public Long cancelPreLoan(String channelOrderNumber) {
+        if (Application.isDebug()) {
+            return cancelPreLoanRepository.cancelPreLoan(channelOrderNumber);
+        } else {
+            return -1L;
+        }
+    }
+
+
+    /**
+     * 通过userId获取合同
+     * @param userId
      * @return
      */
-    public boolean pushLendingResult(Long loanId, Integer status) {
+    public Contract findContractByUserId(Long userId) {
+        return contractRepository.findByUserIdLastOne(userId);
+    }
 
-        // TODO WEIWEI 查看返回的数据结构，补充判断逻辑
+    /**
+     * 保存合同
+     * @param contract
+     */
+    public void saveContract(Contract contract) {
+        if (Application.isDebug()) {
+            contractRepository.save(contract);
+        }
+    }
 
-        String data = this.xyqbCenter.pushLendingResult(new HashMap() {{
-            put("orderNo", loanId);
-            put("payOrderNo", loanId);
-            put("payTime", new Date().getTime());
-            put("payStatus", status);
-        }});
 
-        return false;
+    public WaitingFundingCorpOperatePeople findWaitingFundingCorpOperatePeopleByLoanId(Long loanId) {
+        return waitingFundingCorpOperatePeopleRepository.findByLoanApplicationHistoryId(loanId);
+    }
 
+    @Transactional
+    public void saveWaitingFundingCorpOperatePeople(WaitingFundingCorpOperatePeople waitingFundingCorpOperatePeople) {
+        if (Application.isDebug()) {
+            waitingFundingCorpOperatePeopleRepository.saveAndFlush(waitingFundingCorpOperatePeople);
+        }
     }
 
 
+    /**
+     * 通过资方id 查找资产计划开关
+     * @param corpPolicyId
+     * @return
+     */
+    public FundingCorpPolicy findFundingCorpPolicyByCorpPolicyId(Long corpPolicyId) {
+        return fundingCorpPolicyRepository.findByFundingCorpId(corpPolicyId);
+    }
+
+    /**
+     *
+     * @param corpPolicyId 资方id
+     * @param planDate 资产计划日期 精确到天
+     * @return
+     */
+    public FundingAssetAllocationsPrograms findFundingAssetAllocationsProgramsByCorpPolicyIdAndPlanDate(Long corpPolicyId, String planDate) {
+        return fundingAssetAllocationsProgramsRepository.findByFundCorpIdAndPlanDate(corpPolicyId, planDate);
+    }
+
+    public LoanApplicationHistory findLoanApplicationHistoryById(Long loanId) {
+        return loanApplicationHistoryRepository.findById(loanId);
+    }
+
+    /**
+     * 验证资产计划 是否有效
+     * @param corpPolicyId
+     * @param planDate 日期 只能要天
+     * @return
+     */
+    public Boolean validateCorpPolicy(Long corpPolicyId, Date planDate) {
+        Boolean isValidate = true;
+        FundingCorpPolicy fundingCorpPolicy = findFundingCorpPolicyByCorpPolicyId(corpPolicyId);
+        isValidate = isValidate & fundingCorpPolicy.getIsAutoAssign() & fundingCorpPolicy.getIsAutoLoan();
+
+        FundingAssetAllocationsPrograms fundingAssetAllocationsPrograms = findFundingAssetAllocationsProgramsByCorpPolicyIdAndPlanDate(corpPolicyId, DateUtil.format(planDate, DateUtil.YYYY_MM_DD));
+        return isValidate & (fundingAssetAllocationsPrograms != null);
+    }
+
     /**
      * 查询订单当前状态
      * @param creditOrderNumber
@@ -94,12 +160,13 @@ public class XYQBCenterService {
 
         Map paramMap = Maps.newHashMap();
         paramMap.put("orderNo", creditOrderNumber);
-        if (loanId != null) {
+        if (loanId != null && loanId > 1) {
             paramMap.put("loanId", loanId);
         }
         paramMap = SignUtil.sign(SignUtil.KA_API_KEY, paramMap);
-
-        return xyqbCenter.getOrderStatus(paramMap);
+        final ServiceResult<XyqbCurrentOrderStatusServiceResultModel> orderStatus = xyqbCenter.getOrderStatus(paramMap);
+        log.info("[getXyqbOrderStatus]xyqb订单状态查询,creditOrderNumber={},result={}", creditOrderNumber, JSONTools.serialize(orderStatus));
+        return orderStatus;
     }
 
     /**
@@ -120,4 +187,29 @@ public class XYQBCenterService {
         return xyqbCenter.getXyqbOrderHistoryStatus(paramMap);
     }
 
+    /**
+     * 放款 放款结果通知
+     * @param loanId 订单loanId
+     * @param expectPayResult 期望放款结果 true 放款成功 false 放款失败
+     * @return
+     */
+    public boolean payResultNotify(Long loanId, Boolean expectPayResult) {
+        if (Application.isDebug()) {
+            Map paramMap = Maps.newHashMap();
+            paramMap.put("orderNo", loanId);
+            paramMap.put("payOrderNo", loanId);
+            paramMap.put("payTime", "");
+            paramMap.put("payStatus", expectPayResult ? 3 : 4);
+            String result = xyqbCenter.pushLendingResult(paramMap);
+            log.info("[放款结果通知]xyqb返回结果result={}", result);
+            return "success".equals(result) || "SUCCESS".equals(result);
+        } else {
+            return false;
+        }
+
+    }
+
+
+
+
 }