|
@@ -1458,7 +1458,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
@Override
|
|
@Override
|
|
|
public QuoteEchoVo getOrderDetail(String ordersNo, String from) {
|
|
public QuoteEchoVo getOrderDetail(String ordersNo, String from) {
|
|
|
log.info("获取订单详情.ordersNo=[{}], from=[{}]", ordersNo, from);
|
|
log.info("获取订单详情.ordersNo=[{}], from=[{}]", ordersNo, from);
|
|
|
- InsOrdersVo insOrdersVo = selectByIdNoSalesmanInfo(Long.parseLong(ordersNo));
|
|
|
|
|
|
|
+ InsOrdersVo insOrdersVo = null;
|
|
|
|
|
+ // from=share 表示从分享链接进入,否则表示从订单列表进入
|
|
|
|
|
+ if ("share".equals(from)) {
|
|
|
|
|
+ insOrdersVo = selectByIdNoSalesmanInfo(Long.parseLong(ordersNo));
|
|
|
|
|
+ }else {
|
|
|
|
|
+ insOrdersVo = selectById(Long.parseLong(ordersNo));
|
|
|
|
|
+ }
|
|
|
log.info("根据orderNo=[{}]查询到的订单明细[{}]", ordersNo, JSONUtil.toJsonStr(insOrdersVo));
|
|
log.info("根据orderNo=[{}]查询到的订单明细[{}]", ordersNo, JSONUtil.toJsonStr(insOrdersVo));
|
|
|
AssertionUtils.isFail(Objects.isNull(insOrdersVo), "订单不存在");
|
|
AssertionUtils.isFail(Objects.isNull(insOrdersVo), "订单不存在");
|
|
|
QuoteEchoVo resultVo = new QuoteEchoVo(insOrdersVo);
|
|
QuoteEchoVo resultVo = new QuoteEchoVo(insOrdersVo);
|