mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

下单修复

Browse Source
This commit is contained in:
mkm 2023-10-28 17:51:20 +08:00
parent 3f1546e7b2
commit cff6927976
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/repositories/store/order/StoreCartRepository.php
View File

@ -65,7 +65,12 @@ class StoreCartRepository extends BaseRepository
$item['product'] = $product_make->getFailProduct($item['product_id']); $item['product'] = $product_make->getFailProduct($item['product_id']);
$fail[] = $item; $fail[] = $item;
} else { } else {
//商户信息
if ($item['merchant']){
$merchantData = $item['merchant']->append(['openReceipt'])->toArray(); $merchantData = $item['merchant']->append(['openReceipt'])->toArray();
} else {
$merchantData = ['mer_id' => 0];
}
unset($item['merchant']); unset($item['merchant']);
$coupon_make = app()->make(StoreCouponRepository::class); $coupon_make = app()->make(StoreCouponRepository::class);
if (!isset($arr[$item['mer_id']])) { if (!isset($arr[$item['mer_id']])) {

6
app/common/repositories/store/order/StoreOrderCreateRepository.php
View File

@ -777,9 +777,9 @@ class StoreOrderCreateRepository extends StoreOrderRepository
'mer_integral_status' => 0, 'mer_integral_status' => 0,
]; ];
$allow_no_address = $allow_no_address && $merchantCart['order']['isTake']; $allow_no_address = $allow_no_address && $merchantCart['order']['isTake'];
foreach ($merchantCart['config'] as $config) { // foreach ($merchantCart['config'] as $config) {
$merchantCart['take'][$config['config_key']] = $config['value']; // $merchantCart['take'][$config['config_key']] = $config['value'];
} // }
$merIntegralConfig = $merchantCart['take']; $merIntegralConfig = $merchantCart['take'];
unset($merchantCart['config']); unset($merchantCart['config']);
$merIntegralConfig['mer_integral_rate'] = min(1, $merIntegralConfig['mer_integral_rate'] > 0 ? bcdiv($merIntegralConfig['mer_integral_rate'], 100, 4) : $merIntegralConfig['mer_integral_rate']); $merIntegralConfig['mer_integral_rate'] = min(1, $merIntegralConfig['mer_integral_rate'] > 0 ? bcdiv($merIntegralConfig['mer_integral_rate'], 100, 4) : $merIntegralConfig['mer_integral_rate']);