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

app/common/enum/CommonEnum.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace app\common\enum;
+
+class CommonEnum
+{
+    const IS_DEL = [
+        'No' => ['code' => 0, 'name' => '未删除'],
+        'Yes' => ['code' => 1, 'name' => '已删除'],
+        'Pending' => ['code' => 2, 'name' => '待删除']
+    ];
+}

app/common/enum/user/UserEnum.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace app\common\enum\user;
+
+use app\common\enum\CommonEnum;
+
+class UserEnum extends CommonEnum
+{
+    const STATUS = [
+        'Disabled' => ['code' => 0, 'name' => '禁用'],
+        'Normal' => ['code' => 1, 'name' => '正常']
+    ];
+}

app/controller/api/store/order/StoreOrder.php

@@ -11,6 +11,7 @@
 namespace app\controller\api\store\order;
 
 
+use app\common\enum\user\UserEnum;
 use app\common\model\store\order\StoreRefundOrder;
 use app\common\model\system\admin\Log;
 use app\common\repositories\merchant\MerchantRepository;
@@ -18,6 +19,7 @@ use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\user\UserAddressRepository;
 use app\common\repositories\user\UserRepository;
 use app\traits\ShouxinyiApiRequest;
+use app\validate\api\store\order\CreateValidate;
 use crmeb\basic\BaseController;
 use app\common\repositories\store\order\StoreCartRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
@@ -692,16 +694,27 @@ class StoreOrder extends BaseController
     }
 
     /**
-     * @param StoreCartRepository $cartRepository
-     * @return mixed
-     * @author xaboy
-     * @day 2020/6/10
+     * @param CreateValidate $createValidate
+     * @return false|string|\think\response\Json
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws \Throwable
      */
-    public function createOrderNew(StoreCartRepository $cartRepository)
+    public function createOrderNew(CreateValidate $createValidate)
     {
         // 1、接收参数
+        $validationResult = $createValidate->validateRequest();
+        // 如果验证失败，返回错误
+        if ($validationResult['status'] == 'error') {
+            return json($validationResult);
+        }
+        // 验证通过，继续处理数据
+        $allParams = $validationResult['data'];
+
+
         $allParams = input();
-        \think\facade\Log::info("createOrder params" . json_encode($allParams));
+
         $cartId = $allParams['cart_id'] ?? null;
         if (is_null($cartId)) {
             return app('json')->fail("缺少购物车ID参数!");
@@ -718,6 +731,15 @@ class StoreOrder extends BaseController
         $mer_id = $this->request->param('mer_id', '');//分享id
         $uid = $this->request->uid();
 
+        // 验证用户信息
+        try {
+            $userData = Db::name('user')
+                ->where('uid', $uid)
+                ->where('is_del', '=', UserEnum::IS_DEL['No']['code'])
+                ->find();
+        } catch (\Exception $e) {
+            return app('json')->fail('获取当前用户信息失败');
+        }
 
         // 2、加锁，他之前加的锁好像在锁狗屎，毛线都没锁住, 而且为什么要锁用户
         // 增加锁，防止同一用户重读点击
@@ -759,27 +781,18 @@ class StoreOrder extends BaseController
         $userAddressRepository = app()->make(UserAddressRepository::class);
         try {
             $addressData = $userAddressRepository->getWhere(['uid' => $uid, 'address_id' => $addressId]);
-        } catch (\Exception $e) {
-            return app('json')->fail('获取用户收货地址失败');
-        }
-        // 如果不是会员专区的商品，则一定要用户完善的收货地址
-        if ($mer_id != 496) {
-            if (!$addressData['city_id']) {
+            // 如果不是会员专区的商品，则一定要用户完善的收货地址
+            if (empty($addressData['city_id'] ?? null)) {
                 return app('json')->fail('请选择正确的收货地址');
             }
-            if ($addressData['code_list'] == '') {
+            if (empty($addressData['code_list'] ?? null)) {
                 return app('json')->fail('地址需要选择4级地址！请修改地址！');
             }
-        }
-
-        // 判断组合支付逻辑，积分、VR、京豆
-        try {
-            $userData = Db::name("user")
-                ->where("uid", $uid)
-                ->find();
         } catch (\Exception $e) {
-            return app('json')->fail('获取当前用户信息失败');
+            return app('json')->fail('获取用户收货地址失败');
         }
+
+
         $array_fzone_paytype_all = [
             'fzone_pay_jingdou' => 0,
             'fzone_pay_vr' => 0,

app/validate/api/store/order/CreateValidate.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace app\validate\api\store\order;
+
+use app\Request;
+use think\facade\Log;
+use think\Validate;
+
+class CreateValidate extends Validate
+{
+    protected $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+        parent::__construct();
+    }
+
+    protected $rule = [
+        'cart_id' => 'require|integer',
+        'fzone_paytype' => 'require|json',
+        'address_id' => 'require|integer|gt:0',
+        'pay_type' => 'require|integer',
+        'share_id' => 'integer',  // share_id 变为非必填项
+    ];
+
+    protected $message = [
+        'cart_id.require' => '购物车ID不能为空！',
+        'cart_id.integer' => '购物车ID必须是整数！',
+        'fzone_paytype.require' => '支付方式不能为空！',
+        'fzone_paytype.json' => '支付方式必须是有效的JSON格式！',
+        'address_id.require' => '地址ID不能为空！',
+        'address_id.integer' => '地址ID必须是整数！',
+        'address_id.gt' => '地址ID必须大于0！',
+        'pay_type.require' => '支付方式不能为空！',
+        'pay_type.integer' => '支付方式类型错误！',
+        'share_id.integer' => 'share_id 必须是整数！',  // 错误信息，适用于share_id
+    ];
+
+
+    /**
+     * 将Request参数获取与验证封装到验证类中
+     *
+     * @return array
+     */
+    public function validateRequest(): array
+    {
+        $data = $this->request->post();
+        Log::info('request-api-store-order-create-params：' . json_encode($data));
+        if (!$this->check($data)) {
+            return ['status' => 'error', 'message' => $this->getError()];
+        }
+        return ['status' => 'success', 'data' => $data];
+    }
+}