|
|
@@ -43,7 +43,6 @@ class OrderService extends BaseService
|
|
|
util::fail('请去掉订金,不再支持订金方式');
|
|
|
}
|
|
|
$forwardStock = $data['forwardStock'] ?? 0;
|
|
|
- $groupCover = '';
|
|
|
|
|
|
$product = $data['product'] ?? [];
|
|
|
//组合
|
|
|
@@ -89,6 +88,7 @@ class OrderService extends BaseService
|
|
|
|
|
|
$manyType = count($product) > 1 ? 1 : 0;
|
|
|
$totalWeight = 0;
|
|
|
+ $orderCover = '';
|
|
|
foreach ($product as $key => $val) {
|
|
|
if (!isset($val['property'])) {
|
|
|
util::fail('没有找到产品属性');
|
|
|
@@ -112,8 +112,8 @@ class OrderService extends BaseService
|
|
|
$flower = $currentGoodsInfo['flower'] ?? 0;
|
|
|
$kindId = $currentGoodsInfo['kindId'] ?? 0;
|
|
|
$kindName = $currentGoodsInfo['kindName'] ?? 0;
|
|
|
- if (!empty($groupCover)) {
|
|
|
- $groupCover = $cover;
|
|
|
+ if (empty($orderCover)) {
|
|
|
+ $orderCover = $cover;
|
|
|
}
|
|
|
$currentMainId = $currentGoodsInfo['mainId'] ?? 0;
|
|
|
if ($currentMainId != $mainId) {
|
|
|
@@ -147,8 +147,8 @@ class OrderService extends BaseService
|
|
|
$currentInfo = $itemInfo[$currentId] ?? [];
|
|
|
$name = $currentInfo['name'] ?? '';
|
|
|
$cover = $currentInfo['cover'] ?? '';
|
|
|
- if (!empty($groupCover)) {
|
|
|
- $groupCover = $cover;
|
|
|
+ if (empty($orderCover)) {
|
|
|
+ $orderCover = $cover;
|
|
|
}
|
|
|
$ratio = $currentInfo['ratio'] ?? 20;
|
|
|
$currentMainId = $currentInfo['mainId'] ?? 0;
|
|
|
@@ -263,7 +263,7 @@ class OrderService extends BaseService
|
|
|
if ($hasPay == dict::getDict('hasPay', 'balance')) {
|
|
|
$payWay = dict::getDict('payWay', 'balancePay');
|
|
|
}
|
|
|
-
|
|
|
+ $data['cover'] = $orderCover;
|
|
|
$data['actPrice'] = $modifyPrice;
|
|
|
$data['realPrice'] = $modifyPrice;
|
|
|
$data['customId'] = $customId;
|