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

# By lupeng
# Via lupeng
* 'master' of http://git.quantgroup.cn/QG/cash-loan-flow-boss:
  回调地址从clf库查询
  修改时间格式

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

@@ -65,6 +65,19 @@ public class ChannelConfServiceImpl implements ChannelConfService {
         ChannelConfVo channelConfVo;
         if (channelConf != null) {
             channelConfVo = ChannelConfUtil.channelConfConvertVOModel(channelConf);
+            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);
+            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.setAddInfo(channelConfAddModel);
         } else {
             // boss channel_conf 为空，从clf 查询数据
             ClfChannelConfiguration channelConfiguration = clfCenterService.findChannelConfigurationByChannelId(channelId);

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

@@ -428,7 +428,7 @@ public class MoOrderServiceImpl implements OrderService{
                 VoOrderStatus voOrderStatus = new VoOrderStatus();
                 Tuple<String, String> stautsName = OrderUtil.KaNoticeTypeNameConvertChnName(queryXyqbOrderStatus.getStatus());
                 voOrderStatus.setStatus(stautsName.getValue());
-                voOrderStatus.setUpdateTime(new Date(queryXyqbOrderStatus.getUpdateTime()));
+                voOrderStatus.setUpdateTime(new Date(queryXyqbOrderStatus.getUpdateTime()*1000));
                 historyStatusList.add(voOrderStatus);
             }
             historyOrderStatusVoModel.setHistoryStatus(historyStatusList);