|
|
@@ -10,7 +10,6 @@ import com.sckw.core.model.vo.TableTop;
|
|
|
import com.sckw.core.utils.BeanUtils;
|
|
|
import com.sckw.core.utils.CollectionUtils;
|
|
|
import com.sckw.core.utils.StringTimeUtil;
|
|
|
-import com.sckw.core.web.context.LoginUserHolder;
|
|
|
import com.sckw.order.api.dubbo.TradeOrderInfoService;
|
|
|
import com.sckw.order.api.model.*;
|
|
|
import com.sckw.payment.dao.KwpLedgerTradeMapper;
|
|
|
@@ -181,7 +180,12 @@ public class LedgerTradeService extends AbsLedger {
|
|
|
OrderDetailRes orderDetailById;
|
|
|
//查询贸易订单详情
|
|
|
for (Long aLong : collect) {
|
|
|
- orderDetailById = tradeOrderInfoService.getOrderDetailById(aLong);
|
|
|
+ try {
|
|
|
+ orderDetailById = tradeOrderInfoService.getOrderDetailById(aLong);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("不存在该订单！tradeOrderInfoService.getOrderDetailById({})", aLong, e);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
detailRes.add(changeOrder(orderDetailById));
|
|
|
}
|
|
|
ledgerTradeDetailVo.setOrderList(detailRes);
|
|
|
@@ -248,7 +252,7 @@ public class LedgerTradeService extends AbsLedger {
|
|
|
/**
|
|
|
* 查询对账单详情
|
|
|
*
|
|
|
- * @param id 对账单id
|
|
|
+ * @param id 对账单id
|
|
|
* @return 对账单详情
|
|
|
*/
|
|
|
public LedgerTradeDetailVo queryDetail(Long id) {
|
