|
@@ -2,6 +2,7 @@ package com.fjhx.victoriatourist.service.purchase.impl;
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
+import cn.hutool.extra.spring.SpringUtil;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional;
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
|
|
@@ -220,7 +221,9 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
|
|
|
|
|
|
//发起快递100订阅
|
|
//发起快递100订阅
|
|
DynamicDataSourceContextHolder.push(SourceConstant.KD100);
|
|
DynamicDataSourceContextHolder.push(SourceConstant.KD100);
|
|
- Integer state = KD100Util.monitor(logisticsInfos.getLogisticsCompanyCode(), logisticsInfos.getCode(), logisticsInfos.getId(), 5, LogisticsInfos.class).getState();
|
|
|
|
|
|
+ //只在生产环境调用Kd100
|
|
|
|
+ String activeProfile = SpringUtil.getActiveProfile();
|
|
|
|
+ Integer state = !"prod".equals(activeProfile) ? -1 : KD100Util.monitor(logisticsInfos.getLogisticsCompanyCode(), logisticsInfos.getCode(), logisticsInfos.getId(), 5, LogisticsInfos.class).getState();
|
|
DynamicDataSourceContextHolder.poll();
|
|
DynamicDataSourceContextHolder.poll();
|
|
logisticsInfos.setLogisticsStatus(state);
|
|
logisticsInfos.setLogisticsStatus(state);
|
|
logisticsInfos.setIsKd100(1);
|
|
logisticsInfos.setIsKd100(1);
|