|
|
@@ -191,6 +191,10 @@ class Order extends BaseController
|
|
|
$data['delivery_name'] = '';
|
|
|
$data['delivery_id'] = '';
|
|
|
$method = 'delivery';
|
|
|
+
|
|
|
+// 因为没有确认收货所以要判断判断积分份额
|
|
|
+ $order = $this->repository->getWhere(['order_id' => $id]);
|
|
|
+ app()->make(StoreOrderRepository::class)->getOrderAward($order);
|
|
|
break;
|
|
|
case 4: //电子面单
|
|
|
if (!systemConfig('crmeb_serve_dump') || merchantConfig($this->request->merId(), 'mer_dump_switch') == 0)
|
