|
|
@@ -10,6 +10,7 @@ use bizHd\custom\classes\HdClass;
|
|
|
use bizHd\goods\classes\GoodsClass;
|
|
|
use bizHd\merchant\services\ShopService;
|
|
|
use bizHd\order\classes\OrderClass;
|
|
|
+use bizHd\order\classes\OrderForwardClass;
|
|
|
use bizHd\order\classes\OrderItemClass;
|
|
|
use bizHd\order\classes\OrderSendClass;
|
|
|
use bizHd\order\services\OrderService;
|
|
|
@@ -947,6 +948,15 @@ class OrderController extends BaseController
|
|
|
$detail = OrderClass::getFullInfo($id);
|
|
|
OrderService::valid($detail, $this->mainId);
|
|
|
|
|
|
+ $forwardMap = [];
|
|
|
+ if ($detail['forward'] == 1) {
|
|
|
+ //当前单如果已经是售后付款单,则取出其对应的原单
|
|
|
+ $map = OrderForwardClass::getByCondition(['shOrderId' => $id], true);
|
|
|
+ $originOrderId = $map->orderId ?? 0;
|
|
|
+ $forwardMap['orderId'] = $originOrderId;
|
|
|
+ }
|
|
|
+ $detail['forwardMap'] = $forwardMap;
|
|
|
+
|
|
|
$main = $this->main;
|
|
|
//是否走售后付款单模式判断 ssh
|
|
|
$ret = OrderClass::ifShPay($detail, $main, 0);
|