|
|
@@ -2457,7 +2457,7 @@ class StoreOrderRepository extends BaseRepository
|
|
2457
|
2457
|
$merchant = app()->make(MerchantRepository::class);
|
|
2458
|
2458
|
$tmpMerchantInfo = $merchant->get($store_product_datas['mer_id']);
|
|
2459
|
2459
|
// 1企业2个体3个人
|
|
2460
|
|
- if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [2, 3])) {
|
|
|
2460
|
+ if ($tmpMerchantInfo && in_array($tmpMerchantInfo['type'], [1, 2, 3])) {
|
|
2461
|
2461
|
$jf = $orderpri - bcmul($store_product_datas['concession_pri'], 0.3, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.3, 2);
|
|
2462
|
2462
|
$jd = $orderpri - bcmul($store_product_datas['concession_pri'], 0.35, 2) . ' + ' . bcmul($store_product_datas['concession_pri'], 0.35, 2);
|
|
2463
|
2463
|
if ($store_product_datas['concession_pri'] != null || $store_product_datas['concession_pri'] != 0) {
|