diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 9d786bcc..14aad678 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -518,7 +518,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository 'coupon_price' => $coupon_price, 'svip_coupon_merge' => $svip_coupon_merge, 'postage_price' => $postage_price, - 'isTake' => in_array(2, $merchantCart['delivery_way']), + 'isTake' => $isTake, 'total_num' => $total_num, 'enabledCoupon' => $enabledCoupon, 'useCouponIds' => $useCouponIds, diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php index ea66f885..955d5d2c 100644 --- a/app/common/repositories/store/product/ProductRepository.php +++ b/app/common/repositories/store/product/ProductRepository.php @@ -259,6 +259,7 @@ class ProductRepository extends BaseRepository $activity_id = 0; $result = $this->dao->create($product); $settleParams = $this->setAttrValue($data, $result->product_id, $productType, 0, $data['mer_id']); + $data['mer_cate_id'] = is_string($data['mer_cate_id']) && !empty($data['mer_cate_id']) ? explode(',', $data['mer_cate_id']) : []; $settleParams['cate'] = $this->setMerCate($data['mer_cate_id'], $result->product_id, $data['mer_id']); $settleParams['attr'] = $this->setAttr($data['attr'], $result->product_id); if ($productType == 0) app()->make(ParameterValueRepository::class)->create($result->product_id, $data['params'] ?? [], $data['mer_id']); diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index 321e7144..ab66066a 100644 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -188,6 +188,7 @@ class MerchantIntentionRepository extends BaseRepository 'margin' => $margin['margin'] ?? 0, 'mark' => $margin['margin'] ?? 0, 'mer_state' => 1, //审核通过自动开启 + 'city_id' => $intention['city_id'], 'area_id' => $intention['area_id'], 'street_id' => $intention['street_id'], 'village_id' => $intention['village_id'],