渠道信息查询 优化

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

@@ -36,7 +36,7 @@ public class ChannelConfController {
     @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信息不对");
         }

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

@@ -11,6 +11,7 @@ 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.spi.clf.repository.ClfCallbackConfigurationRepository;
 import cn.quantgroup.cashloanflowboss.spi.clf.repository.ClfChannelConfigurationRepository;
 import cn.quantgroup.cashloanflowboss.api.channel.util.ChannelConfUtil;
@@ -82,7 +83,18 @@ public class ChannelConfService {
 
     public ChannelConfVo getChannelConf(Long channelId) {
         ChannelConf channelConf = channelConfRepository.getByChannelId(channelId);
-        return ChannelConfUtil.channelConfConvertVOModel(channelConf);
+
+        if (channelConf != null) {
+            return ChannelConfUtil.channelConfConvertVOModel(channelConf);
+        } else {
+            // boss channel_conf 为空，从clf 查询数据
+            ClfChannelConfiguration channelConfiguration = clfChannelConfigurationRepository.findByRegisteredFrom(channelId);
+            ClfOrderCallBack approve = clfOrderCallbackRepository.findByCallbackStatusAndRegisteredFrom(KANoticeType.FUAD_ASSIFN_SUCC.name(), channelId);
+            ClfOrderCallBack orderStatus = clfOrderCallbackRepository.findByCallbackStatusAndRegisteredFrom(KANoticeType.FUND_SUCC.name(), channelId);
+            ClfOrderCallBack repaymentPlan = clfOrderCallbackRepository.findByCallbackStatusAndRegisteredFrom(KANoticeType.REPAYMENT.name(), channelId);
+
+            return ChannelConfUtil.getChannelConfVoByClf(channelConfiguration, approve, orderStatus, repaymentPlan);
+        }
     }
 
 

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/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/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;
-
-}