From 6f8ab98bf5bb78a5dbc8e009b66b620ca94122e0 Mon Sep 17 00:00:00 2001 From: monanxiao Date: Thu, 16 Mar 2023 12:03:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=BB=84=E9=87=87?= =?UTF-8?q?=E8=B4=AD=EF=BC=8C=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B2=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/order/StoreOrderCreateRepository.php | 7 ++++++- .../repositories/store/product/ProductDgRepository.php | 1 + app/controller/api/store/order/StoreCart.php | 9 ++------- app/controller/api/store/order/StoreCartDg.php | 8 +------- crmeb/jobs/SupplyChainOrderBrokerAgeJob.php | 2 +- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/app/common/repositories/store/order/StoreOrderCreateRepository.php b/app/common/repositories/store/order/StoreOrderCreateRepository.php index 33ba6cf3..faa06d08 100644 --- a/app/common/repositories/store/order/StoreOrderCreateRepository.php +++ b/app/common/repositories/store/order/StoreOrderCreateRepository.php @@ -1132,7 +1132,12 @@ class StoreOrderCreateRepository extends StoreOrderRepository $cart['extension_one'] = $extension_one; $cart['extension_two'] = $extension_two; $cart['cost'] = $cost; - + // 获取购物车ID + foreach ($merchantCart['list'] as &$cart) { + $cartIds[] = $cart['cart_id']; + } + unset($cart); + // 开始计算------------------------------------------------------------ // 实际支付金额 diff --git a/app/common/repositories/store/product/ProductDgRepository.php b/app/common/repositories/store/product/ProductDgRepository.php index 2d0362ea..a2ef9afd 100644 --- a/app/common/repositories/store/product/ProductDgRepository.php +++ b/app/common/repositories/store/product/ProductDgRepository.php @@ -1794,6 +1794,7 @@ class ProductDgRepository extends BaseRepository $_num = $this->productOnceCountCart($where['product_id'],$data['product_attr_unique'], $userInfo->uid); $cart_num = $_num + $data['cart_num']; } + if ($sku['stock'] < $cart_num ) throw new ValidateException('库存不足'); //添加购物车 if (!$data['is_new']) { diff --git a/app/controller/api/store/order/StoreCart.php b/app/controller/api/store/order/StoreCart.php index 4c4718f0..b4541a1d 100644 --- a/app/controller/api/store/order/StoreCart.php +++ b/app/controller/api/store/order/StoreCart.php @@ -68,7 +68,7 @@ class StoreCart extends BaseController { $data = $this->checkParams($validate); - if(!in_array($data['product_type'],[0,1,2,3,4,99])) return app('json')->fail('商品类型错误'); + if(!in_array($data['product_type'],[0,1,2,3,4])) return app('json')->fail('商品类型错误'); if ($data['cart_num'] <= 0) return app('json')->fail('购买数量有误'); $user = $this->request->userInfo(); event('user.cart.before',compact('user','data')); @@ -102,12 +102,7 @@ class StoreCart extends BaseController $data['source_id'] = $data['group_buying_id']; $data['product_id'] = $result['product']['product_id']; break; - case 99: //小组代购 - $result = app()->make(ProductRepository::class)->cartCheck($data,$this->request->userInfo()); - [$source, $sourceId, $pid] = explode(':', $this->request->param('source', '0'), 3) + ['', '', '']; - $data['source'] = (in_array($source, [0, 1]) && $pid == $data['product_id']) ? $source : 0; - if ($data['source'] > 0) $data['source_id'] = intval($sourceId); - break; + } unset($data['group_buying_id']); diff --git a/app/controller/api/store/order/StoreCartDg.php b/app/controller/api/store/order/StoreCartDg.php index 3d12923d..f486a381 100644 --- a/app/controller/api/store/order/StoreCartDg.php +++ b/app/controller/api/store/order/StoreCartDg.php @@ -70,7 +70,7 @@ class StoreCartDg extends BaseController public function create(validate $validate) { $data = $this->checkParams($validate); - if(!in_array($data['product_type'],[0,1,2,3,4,99])) return app('json')->fail('商品类型错误'); + if(!in_array($data['product_type'],[0,1,2,3,4])) return app('json')->fail('商品类型错误'); if ($data['cart_num'] <= 0) return app('json')->fail('购买数量有误'); $user = $this->request->userInfo(); event('user.cart.before',compact('user','data')); @@ -104,12 +104,6 @@ class StoreCartDg extends BaseController $data['source_id'] = $data['group_buying_id']; $data['product_id'] = $result['product']['product_id']; break; - case 99: //小组代购 - $result = app()->make(ProductDgRepository::class)->cartCheck($data,$this->request->userInfo()); - [$source, $sourceId, $pid] = explode(':', $this->request->param('source', '0'), 3) + ['', '', '']; - $data['source'] = (in_array($source, [0, 1]) && $pid == $data['product_id']) ? $source : 0; - if ($data['source'] > 0) $data['source_id'] = intval($sourceId); - break; } unset($data['group_buying_id']); diff --git a/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php b/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php index 9269b9fd..f83e194a 100644 --- a/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php +++ b/crmeb/jobs/SupplyChainOrderBrokerAgeJob.php @@ -262,7 +262,7 @@ class SupplyChainOrderBrokerAgeJob implements JobInterface // SupplyChainBorkerage::create($dataArrSix); // } - \think\facade\Log::record('执行完毕'); + \think\facade\Log::record('供应链佣金分布执行完毕'); } catch (\Exception $e) { Log::info('小组服务佣金同步失败: ' . var_export($data, 1) . $e->getMessage());