优化用户下单方法-进行中

app/common/enum/store/CartEnum.php

@@ -14,4 +14,10 @@ class CartEnum extends CommonEnum
         'No' => ['code' => 0, 'name' => '未失效'],
         'Yes' => ['code' => 1, 'name' => '失效']
     ];
+
+    // 是否已购买 '0 = 未购买 1 = 已购买'
+    const IS_PAY = [
+        'No' => ['code' => 0, 'name' => '未购买'],
+        'Yes' => ['code' => 1, 'name' => '已购买']
+    ];
 }

app/common/repositories/store/order/StoreOrderRepository.php

@@ -10645,7 +10645,9 @@ class StoreOrderRepository extends BaseRepository
      */
     public function createOrderNew(StoreOrderCreateRequestEntity $storeOrderCreateRequestEntity, UserEntity $userEntity, array $cartEntityList, AddressEntity $addressEntity, ShareEntity $shareEntity)
     {
-
+        // 购物车
+        /** @var StoreCartRepository $storeCartRepository */
+        $storeCartRepository = app()->make(StoreCartRepository::class);
         // 商户
         /** @var MerchantRepository $merchantRepository */
         $merchantRepository = app()->make(MerchantRepository::class);
@@ -10905,11 +10907,27 @@ class StoreOrderRepository extends BaseRepository
 
 
 
-            // 会员专区
-            if ($productEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']) {
+            // // 会员专区
+            // if ($productEntity->getMerId() == CommonEnum::DESIGN_MERCHANT_ID['MemberZone']['code']) {
+            //
+            // }
 
+            // 更新库存
+            if ($cartEntity->getProductType() == CartEnum::PRODUCT_TYPE['Ordinary']['code']) {
+                $productAttrValueRepository->descStock($productAttrValueEntity->getProductId(), $productAttrValueEntity->getUnique(), $cartEntity->getCartNum());
+                $productRepository->descStock($productEntity->getProductId(), $cartEntity->getCartNum());
+            } else {
+                $productAttrValueRepository->descSkuStock($productEntity->getOldProductId(), $productAttrValueEntity->getSku(), $cartEntity->getCartNum());
+                $productRepository->descStock($productEntity->getOldProductId(), $cartEntity->getCartNum());
             }
 
+            // 修改 购物车状态
+            $storeCartRepository->update($cartEntity->getCartId(), ['is_pay' => CartEnum::IS_PAY['Yes']['code']]);
+
+            // 修改优惠券状态
+            // $storeCouponUserRepository->updates([], []);
+
+            // StoreGroupOrderEntity
 
             // 组装数据
             $_order = [
@@ -10976,12 +10994,11 @@ class StoreOrderRepository extends BaseRepository
                 'fzone_pay_note' => $array_fzone_paytype_all['fzone_pay_note'],
                 'fzone_pay_type' => $array_fzone_paytype_all['fzone_pay_type'],
             ];
-        }
 
-        foreach ($orderList as $orderInfo) {
 
         }
 
+
         return [];
     }
 

app/entity/CommonEntity.php

@@ -48,4 +48,37 @@ class CommonEntity
         }
         return $data;
     }
+
+    /**
+     * 将实体属性（驼峰命名）转换为下划线命名的数组
+     * 用于数据库写入
+     * @return array
+     */
+    public function toUnderlineArray(): array
+    {
+        $result = [];
+        $camelArray = $this->toArray(); // 先获取驼峰格式的数组
+
+        foreach ($camelArray as $key => $value) {
+            // 将驼峰键名转为下划线格式
+            $underlineKey = $this->camelToUnderline($key);
+            $result[$underlineKey] = $value;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 驼峰命名转下划线命名
+     * @param string $camel
+     * @return string
+     */
+    private function camelToUnderline(string $camel): string
+    {
+        // 处理连续大写字母（如 "userID" 转 "user_id"）
+        $camel = preg_replace('/([A-Z]+)([A-Z][a-z])/', '$1_$2', $camel);
+
+        // 将大写字母前添加下划线并转为小写
+        return strtolower(preg_replace('/([a-z])([A-Z])/', '$1_$2', $camel));
+    }
 }