|
@@ -77,8 +77,6 @@ class OrderService extends BaseService
|
|
|
$remark = $data['remark'] ?? '';
|
|
$remark = $data['remark'] ?? '';
|
|
|
$xj = $data['xj'] ?? '';
|
|
$xj = $data['xj'] ?? '';
|
|
|
|
|
|
|
|
- $discount = $returnOrder->discount ?? 1;
|
|
|
|
|
-
|
|
|
|
|
$purchaseData = [
|
|
$purchaseData = [
|
|
|
'product' => $currentProduct,
|
|
'product' => $currentProduct,
|
|
|
'sendTimeWant' => $sendTimeWant,
|
|
'sendTimeWant' => $sendTimeWant,
|
|
@@ -101,7 +99,7 @@ class OrderService extends BaseService
|
|
|
'getType' => $getType,
|
|
'getType' => $getType,
|
|
|
'remark' => $remark,
|
|
'remark' => $remark,
|
|
|
'xj' => $xj,
|
|
'xj' => $xj,
|
|
|
- 'discount' => $discount
|
|
|
|
|
|
|
+ 'discount' => 1
|
|
|
];
|
|
];
|
|
|
if (isset($data['deadline']) && !empty($data['deadline'])) {
|
|
if (isset($data['deadline']) && !empty($data['deadline'])) {
|
|
|
$purchaseData['deadline'] = $data['deadline'];
|
|
$purchaseData['deadline'] = $data['deadline'];
|